Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ColumnTableNameResultDTO.java

@@ -0,0 +1,20 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description  查询必填字段-接口返参
+ * @Author sun
+ */
+@Data
+public class ColumnTableNameResultDTO implements Serializable {
+    private static final long serialVersionUID = -8441112171986914418L;
+    //表名
+    private String tableName;
+    //字段中文名
+    private String label;
+    //字段名
+    private String columnName;
+}

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java

@@ -11,6 +11,7 @@ import com.epmet.dto.result.*;
 import com.epmet.feign.fallback.OperCustomizeOpenFeignClientFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -23,8 +24,8 @@ import java.util.Set;
  * @author yinzuomei@elink-cn.com
  * @date 2020/6/4 13:16
  */
-//@FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallbackFactory = OperCustomizeOpenFeignClientFallbackFactory.class,url = "http://localhost:8089")
-@FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallbackFactory = OperCustomizeOpenFeignClientFallbackFactory.class)
+@FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallbackFactory = OperCustomizeOpenFeignClientFallbackFactory.class,url = "http://localhost:8089")
+//@FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallbackFactory = OperCustomizeOpenFeignClientFallbackFactory.class)
 public interface OperCustomizeOpenFeignClient {
 
     @PostMapping(value = "/oper/customize/customerfootbar/customerfootbars", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@@ -88,4 +89,12 @@ public interface OperCustomizeOpenFeignClient {
      */
     @PostMapping("/oper/customize/icform/items")
     Result<List<FormItem>> listItems(@RequestBody CustomerFormQueryDTO formDto);
+
+    /**
+     * @Author sun
+     * @Description 居民信息新增查询各表必填字段
+     **/
+    @PostMapping("/oper/customize/icformitem/getmustcolumn/{customerId}")
+    Result<List<ColumnTableNameResultDTO>> getMustColumn(@PathVariable("customerId") String customerId);
+
 }

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java

@@ -74,4 +74,9 @@ public class OperCustomizeOpenFeignClientFallback implements OperCustomizeOpenFe
 	public Result<List<FormItem>> listItems(CustomerFormQueryDTO formDto) {
 		return ModuleUtils.feignConError(ServiceConstant.OPER_CUSTOMIZE_SERVER, "listItems", formDto);
 	}
+
+	@Override
+	public Result<List<ColumnTableNameResultDTO>> getMustColumn(String customerId) {
+		return ModuleUtils.feignConError(ServiceConstant.OPER_CUSTOMIZE_SERVER, "getMustColumn", customerId);
+	}
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemController.java

@@ -26,6 +26,8 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.IcFormItemDTO;
+import com.epmet.dto.result.ColumnTableNameResultDTO;
+import com.epmet.dto.result.CustomerStaffRoleResultDTO;
 import com.epmet.excel.IcFormItemExcel;
 import com.epmet.service.IcFormItemService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -91,4 +93,13 @@ public class IcFormItemController {
         ExcelUtils.exportExcelToTarget(response, null, list, IcFormItemExcel.class);
     }
 
+    /**
+     * @Author sun
+     * @Description 居民信息新增查询各表必填字段
+     **/
+    @PostMapping("getmustcolumn/{customerId}")
+    public Result<List<ColumnTableNameResultDTO>> getMustColumn(@PathVariable String customerId) {
+        return new Result<List<ColumnTableNameResultDTO>>().ok(icFormItemService.getMustColumn(customerId));
+    }
+
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java

@@ -18,6 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.ColumnTableNameResultDTO;
 import com.epmet.dto.result.ConditionResultDTO;
 import com.epmet.dto.result.IcFormResColumnDTO;
 import com.epmet.dto.result.TableHeaderResultDTO;
@@ -64,4 +65,10 @@ public interface IcFormItemDao extends BaseDao<IcFormItemEntity> {
     List<String> querySubTables(@Param("customerId") String customerId, @Param("formCode")String formCode);
 
     Set<String> queryIcResiSubTables(@Param("customerId") String customerId, @Param("formCode")String formCode);
+
+    /**
+     * @Author sun
+     * @Description 居民信息新增查询各表必填字段
+     **/
+    List<ColumnTableNameResultDTO> getMustColumn(@Param("customerId")String customerId);
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemService.java

@@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IcFormItemDTO;
 import com.epmet.dto.form.CustomerFormQueryDTO;
+import com.epmet.dto.result.ColumnTableNameResultDTO;
 import com.epmet.dto.result.ConditionResultDTO;
 import com.epmet.dto.result.IcFormResColumnDTO;
 import com.epmet.dto.result.TableHeaderResultDTO;
@@ -115,4 +116,10 @@ public interface IcFormItemService extends BaseService<IcFormItemEntity> {
     List<String> querySubTables(String customerId, String formCode);
 
     Set<String> queryIcResiSubTables(String customerId, String formCode);
+
+    /**
+     * @Author sun
+     * @Description 居民信息新增查询各表必填字段
+     **/
+    List<ColumnTableNameResultDTO> getMustColumn(String customerId);
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java

@@ -27,6 +27,7 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.IcFormItemDao;
 import com.epmet.dto.IcFormItemDTO;
 import com.epmet.dto.form.CustomerFormQueryDTO;
+import com.epmet.dto.result.ColumnTableNameResultDTO;
 import com.epmet.dto.result.ConditionResultDTO;
 import com.epmet.dto.result.IcFormResColumnDTO;
 import com.epmet.dto.result.TableHeaderResultDTO;
@@ -153,4 +154,13 @@ public class IcFormItemServiceImpl extends BaseServiceImpl<IcFormItemDao, IcForm
         return baseDao.queryIcResiSubTables(customerId,formCode);
     }
 
+    /**
+     * @Author sun
+     * @Description 居民信息新增查询各表必填字段
+     **/
+    @Override
+    public List<ColumnTableNameResultDTO> getMustColumn(String customerId) {
+        return baseDao.getMustColumn(customerId);
+    }
+
 }

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml

@@ -141,4 +141,21 @@
             AND m.CUSTOMER_ID = #{customerId}
           AND m.FORM_CODE = #{formCode}
     </select>
+
+    <select id="getMustColumn" resultType="com.epmet.dto.result.ColumnTableNameResultDTO">
+        SELECT
+            a.label "label",
+            a.column_name "columnName",
+        IF (
+            ('' = b.table_name OR b.table_name IS NULL ), 'ic_resi_user', b.table_name
+        ) "tableName"
+        FROM
+            ic_form_item a
+        LEFT JOIN ic_form_item_group b ON a.item_group_id = b.id
+        WHERE
+            a.del_flag = '0'
+        AND a.required = '1'
+        AND a.customer_id = #{customerId}
+    </select>
+
 </mapper>

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -162,6 +162,28 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     @Transactional(rollbackFor = Exception.class)
     public void add(TokenDto tokenDto, List<IcResiUserFormDTO> formDTO) {
         //循环自动拼接sql语句，往多个表新增数据
+        //0.校验必填字段是否为空
+        Result<List<ColumnTableNameResultDTO>> resultList = operCustomizeOpenFeignClient.getMustColumn(tokenDto.getCustomerId());
+        if (resultList.success() && null != resultList.getData()) {
+            StringBuffer str = new StringBuffer("");
+            formDTO.forEach(f -> {
+                resultList.getData().forEach(l -> {
+                    if (f.getTableName().equals(l.getTableName())) {
+                        f.getList().forEach(map -> {
+                            if (!map.containsKey(l.getColumnName())) {
+                                str.append(str.length() < NumConstant.ONE ? l.getLabel() : "、" + l.getLabel());
+                            }
+                        });
+                    }
+                });
+            });
+            if (!"".equals(str)) {
+                throw new RenException(String.format("新增居民信息,必要字段值为空,%s值为空", str));
+            }
+        } else {
+            throw new RenException(String.format("新增居民信息-根据客户Id查询必填信息失败，customerId->%s", tokenDto.getCustomerId()));
+        }
+
         //1.先往主表新增数据
         //主表Id
         String resiUserId = UUID.randomUUID().toString().replaceAll("-", "");