Merge branch 'dev' of http://192.168.0.56:3000/bonus/Zlpt-Cloud into dev

zlpt-modules/zlpt-company/pom.xml

@@ -57,6 +57,12 @@
             <version>3.6.3</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.checkerframework</groupId>
+            <artifactId>checker-qual</artifactId>
+            <version>3.5.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>

zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BaseAddressController.java

@@ -0,0 +1,31 @@
+package com.bonus.zlpt.company.controller;
+
+import com.bonus.zlpt.common.core.web.controller.BaseController;
+import com.bonus.zlpt.common.core.web.domain.AjaxResult;
+import com.bonus.zlpt.company.domain.BaseAddress;
+import com.bonus.zlpt.company.service.BaseAddressService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/baseAddress")
+public class BaseAddressController extends BaseController {
+
+    @Autowired
+    private BaseAddressService baseAddressService;
+
+    @PostMapping("/selectAddress")
+    public AjaxResult selectAddress(@RequestBody BaseAddress baseAddress){
+
+       return success(baseAddressService.selectAddress(baseAddress));
+
+    }
+
+
+
+
+
+}

zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCompanyInfoController.java

@@ -7,15 +7,13 @@ import com.bonus.zlpt.common.log.enums.BusinessType;
 import com.bonus.zlpt.common.security.annotation.RequiresPermissions;
 import com.bonus.zlpt.common.security.utils.SecurityUtils;
 import com.bonus.zlpt.company.domain.BmCompanyInfo;
-import com.bonus.zlpt.company.domain.SysDic;
 import com.bonus.zlpt.company.domain.dto.BmCompanyDto;
+import com.bonus.zlpt.company.domain.dto.BmCompanyInfoDto;
 import com.bonus.zlpt.company.domain.vo.BmCompanyInfoVo;
 import com.bonus.zlpt.company.mapper.BmCompanyInfoDao;
 import com.bonus.zlpt.company.service.BmCompanyInfoService;
 import com.bonus.zlpt.common.log.annotation.Log;
-import org.apache.catalina.security.SecurityUtil;
 import org.springframework.web.bind.annotation.*;
-
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.time.LocalDateTime;
@@ -61,7 +59,7 @@ public class BmCompanyInfoController extends BaseController {
     @RequiresPermissions("system:company:add")
     @Log(title = "企业管理", businessType = BusinessType.INSERT)
     @PostMapping("addCompanyInfo")
-    public AjaxResult add(@RequestBody BmCompanyInfo obj) {
+    public AjaxResult add(@RequestBody BmCompanyInfoDto obj) {
         return toAjax(bmCompanyInfoService.insertSelective(obj));
     }
 
@@ -71,13 +69,13 @@ public class BmCompanyInfoController extends BaseController {
     @RequiresPermissions("system:company:edit")
     @Log(title = "企业管理", businessType = BusinessType.UPDATE)
     @PostMapping("updateCompanyInfo")
-    public AjaxResult edit(@RequestBody BmCompanyInfo obj) {
+    public AjaxResult edit(@RequestBody BmCompanyInfoDto obj) {
 
-        Integer deptId = obj.getCompanyId();
+        Integer deptId = obj.getBmCompanyInfo().getCompanyId();
-        if(!"0".equals(obj.getStatus()) && !"3".equals(obj.getStatus())){
+        if(!"0".equals(obj.getBmCompanyInfo().getStatus()) && !"3".equals(obj.getBmCompanyInfo().getStatus())){
             //封装审核人以及审核时间
-            obj.setAuditor(Math.toIntExact(SecurityUtils.getUserId()));
+            obj.getBmCompanyInfo().setAuditor(Math.toIntExact(SecurityUtils.getUserId()));
-            obj.setAuditTime(LocalDateTime.now().toString());
+            obj.getBmCompanyInfo().setAuditTime(LocalDateTime.now().toString());
         }
         return toAjax(bmCompanyInfoService.updateByPrimaryKeySelective(obj));
     }

zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCompanyTypeController.java

@@ -1,6 +1,5 @@
 package com.bonus.zlpt.company.controller;
 
-import com.bonus.zlpt.common.core.domain.R;
 import com.bonus.zlpt.common.core.utils.poi.ExcelUtil;
 import com.bonus.zlpt.common.core.web.controller.BaseController;
 import com.bonus.zlpt.common.core.web.domain.AjaxResult;
@@ -40,11 +39,25 @@ public class BmCompanyTypeController extends BaseController {
     public TableDataInfo selectCompanyTypeList(@RequestBody SysDic sysDic){
 
         startPage();
+        sysDic.setPId(1);
         List<SysDic> list = bmCompanyTypeService.selectCompanyTypeList(sysDic);
         return getDataTable(list);
 
     }
 
+    /**
+     * 根据条件查询证件类型
+     * @return
+     */
+    @PostMapping("/selectIdCard")
+    public TableDataInfo selectIdCard(@RequestBody SysDic sysDic){
+
+        startPage();
+        sysDic.setPId(23);
+        List<SysDic> list = bmCompanyTypeService.selectCompanyTypeList(sysDic);
+        return getDataTable(list);
+
+    }
 
     /**
      * 新增或者修改企业类型

zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/domain/BaseAddress.java

@@ -0,0 +1,51 @@
+package com.bonus.zlpt.company.domain;
+
+import com.bonus.zlpt.common.core.annotation.Excel;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class BaseAddress {
+
+
+    @Excel(name = "id")
+    private Long id;
+
+    @Excel(name = "平台id")
+    private Long platformId;
+
+    @Excel(name = "编码")
+    private String code;
+
+    @Excel(name = "父级编码")
+    private String parentCode;
+
+    @Excel(name = "地区名称")
+    private String name;
+
+    @Excel(name = "纬度")
+    private Double latitude;
+
+    @Excel(name = "经度")
+    private Double longitude;
+
+    @Excel(name = "等级")
+    private Integer level;
+
+    @Excel(name = "区域划分")
+    private Integer region;
+
+    @Excel(name = "状态")
+    private Integer status;
+
+    @Excel(name = "创建时间")
+    private LocalDateTime created;
+
+    @Excel(name = "修改时间")
+    private LocalDateTime modified;
+
+    @Excel(name = "状态")
+    private Integer yn;
+
+}

zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/domain/dto/BmCompanyInfoDto.java

@@ -0,0 +1,14 @@
+package com.bonus.zlpt.company.domain.dto;
+
+import com.bonus.zlpt.company.domain.BmCoBank;
+import com.bonus.zlpt.company.domain.BmCompanyInfo;
+import lombok.Data;
+
+@Data
+public class BmCompanyInfoDto {
+
+
+    private BmCompanyInfo bmCompanyInfo;
+
+    private BmCoBank bmCoBank;
+}

zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/enums/AddressLevelEnum.java

@@ -0,0 +1,26 @@
+package com.bonus.zlpt.company.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+public enum AddressLevelEnum {
+
+
+    //省
+    ECONOMIZE(1),
+    //市
+    MARKET(2),
+    //区
+    DISTINGUISH(3),
+    //镇
+    GARRISON_POST(4),
+    //村
+    VILLAGE(5);
+
+    //层级
+    private final Integer level;
+
+
+}

zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/mapper/BaseAddressMapper.java

@@ -0,0 +1,14 @@
+package com.bonus.zlpt.company.mapper;
+
+import com.bonus.zlpt.company.domain.BaseAddress;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface BaseAddressMapper {
+
+    List<BaseAddress> selectEconomizeAddress();
+
+    List<BaseAddress> selectAddress(BaseAddress baseAddress);
+}

zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/BaseAddressService.java

@@ -0,0 +1,12 @@
+package com.bonus.zlpt.company.service;
+
+
+import com.bonus.zlpt.company.domain.BaseAddress;
+
+import java.util.List;
+
+public interface BaseAddressService {
+
+
+    List<BaseAddress> selectAddress(BaseAddress baseAddress);
+}

zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/BmCompanyInfoService.java

@@ -3,6 +3,7 @@ package com.bonus.zlpt.company.service;
 import com.bonus.zlpt.common.core.web.domain.AjaxResult;
 import com.bonus.zlpt.company.domain.BmCompanyInfo;
 import com.bonus.zlpt.company.domain.dto.BmCompanyDto;
+import com.bonus.zlpt.company.domain.dto.BmCompanyInfoDto;
 import com.bonus.zlpt.company.domain.vo.BmCompanyInfoVo;
 import com.bonus.zlpt.company.domain.vo.BmCompanyVo;
 
@@ -21,11 +22,11 @@ public interface BmCompanyInfoService{
 
     int insert(BmCompanyInfo record);
 
-    int insertSelective(BmCompanyInfo record);
+    int insertSelective(BmCompanyInfoDto record);
 
     BmCompanyInfo selectByPrimaryKey(Integer companyId);
 
-    int updateByPrimaryKeySelective(BmCompanyInfo record);
+    int updateByPrimaryKeySelective(BmCompanyInfoDto record);
 
     int updateByPrimaryKey(BmCompanyInfo record);
 

zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/BaseAddressServiceImpl.java

@@ -0,0 +1,28 @@
+package com.bonus.zlpt.company.service.impl;
+
+import com.bonus.zlpt.company.domain.BaseAddress;
+import com.bonus.zlpt.company.enums.AddressLevelEnum;
+import com.bonus.zlpt.company.mapper.BaseAddressMapper;
+import com.bonus.zlpt.company.service.BaseAddressService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class BaseAddressServiceImpl implements BaseAddressService {
+
+    @Autowired
+    private BaseAddressMapper baseAddressMapper;
+
+
+    @Override
+    public List<BaseAddress> selectAddress(BaseAddress baseAddress) {
+
+        if (baseAddress == null || baseAddress.getCode() == null) {
+            return baseAddressMapper.selectEconomizeAddress();
+        }
+
+        return baseAddressMapper.selectAddress(baseAddress);
+    }
+}

zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/BmCompanyInfoServiceImpl.java

@@ -2,6 +2,7 @@ package com.bonus.zlpt.company.service.impl;
 
 import com.bonus.zlpt.common.core.utils.bean.BeanUtils;
 import com.bonus.zlpt.company.domain.dto.BmCompanyDto;
+import com.bonus.zlpt.company.domain.dto.BmCompanyInfoDto;
 import com.bonus.zlpt.company.domain.vo.BmCompanyInfoVo;
 import com.bonus.zlpt.company.domain.vo.BmCompanyVo;
 import com.bonus.zlpt.company.mapper.BmCoBankMapper;
@@ -17,6 +18,7 @@ import javax.annotation.Resource;
 
 import com.bonus.zlpt.company.domain.BmCompanyInfo;
 import com.bonus.zlpt.company.mapper.BmCompanyInfoDao;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -56,8 +58,12 @@ public class BmCompanyInfoServiceImpl implements BmCompanyInfoService {
     }
 
     @Override
-    public int insertSelective(BmCompanyInfo record) {
+    @Transactional
-        return bmCompanyInfoMapper.insertSelective(record);
+    public int insertSelective(BmCompanyInfoDto record) {
+
+        bmCompanyInfoMapper.insertSelective(record.getBmCompanyInfo());
+        record.getBmCoBank().setCoId(record.getBmCompanyInfo().getCompanyId());
+        return bmCoBankMapper.insertSelective(record.getBmCoBank());
     }
 
     @Override
@@ -66,8 +72,11 @@ public class BmCompanyInfoServiceImpl implements BmCompanyInfoService {
     }
 
     @Override
-    public int updateByPrimaryKeySelective(BmCompanyInfo record) {
+    @Transactional
-        return bmCompanyInfoMapper.updateByPrimaryKeySelective(record);
+    public int updateByPrimaryKeySelective(BmCompanyInfoDto record) {
+
+        bmCoBankMapper.updateByPrimaryKeySelective(record.getBmCoBank());
+        return bmCompanyInfoMapper.updateByPrimaryKeySelective(record.getBmCompanyInfo());
     }
 
     @Override

zlpt-modules/zlpt-company/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 9207
+  port: 8080
 
 # Spring
 spring: 

zlpt-modules/zlpt-company/src/main/resources/mapper/BaseAddressMapper.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.bonus.zlpt.company.mapper.BaseAddressMapper">
+
+
+    <select id="selectEconomizeAddress" resultType="com.bonus.zlpt.company.domain.BaseAddress">
+        select * from base_address where level = 1
+    </select>
+
+    <select id="selectAddress" resultType="com.bonus.zlpt.company.domain.BaseAddress">
+        select * from base_address where parent_code = #{code}
+    </select>
+
+
+</mapper>

zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/TypeInfoServiceImpl.java

@@ -3,7 +3,6 @@ package com.bonus.zlpt.equip.service.impl;
 import java.util.List;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-
 import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.lang.tree.TreeNode;
 import cn.hutool.core.lang.tree.TreeUtil;
@@ -114,8 +113,8 @@ public class TypeInfoServiceImpl implements ITypeInfoService
 
         List<TreeNode<Long>> collect = typeInfoMapper.selectTypeInfoList(new TypeInfo())
                 .stream().map(getNodeFunction()).collect(Collectors.toList());
-        // 模糊查询 不组装树结构 直接返回 表格方便编辑
+
-        return TreeUtil.build(collect,-1L);
+        return TreeUtil.build(collect,0L);
     }