表单初始化暂存

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

@@ -18,28 +18,20 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
-import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.DefaultGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
-import com.epmet.dto.IcFormDTO;
 import com.epmet.dto.form.CustomerFormQueryDTO;
 import com.epmet.dto.result.*;
-import com.epmet.excel.IcFormExcel;
 import com.epmet.service.IcFormItemService;
 import com.epmet.service.IcFormService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 
@@ -58,49 +50,24 @@ public class IcFormController {
     @Autowired
     private IcFormItemService icFormItemService;
 
-    @GetMapping("page")
+    /**
-    public Result<PageData<IcFormDTO>> page(@RequestParam Map<String, Object> params){
+     * desc: 初始化 客户表单配置
-        PageData<IcFormDTO> page = icFormService.page(params);
+     *
-        return new Result<PageData<IcFormDTO>>().ok(page);
+     * @param customerId
-    }
+     * @param formCode
-
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.CustomerFormResultDTO>
-    @GetMapping("{id}")
+     * @author LiuJanJun
-    public Result<IcFormDTO> get(@PathVariable("id") String id){
+     * @date 2021/12/8 4:28 下午
-        IcFormDTO data = icFormService.get(id);
+     */
-        return new Result<IcFormDTO>().ok(data);
+    @GetMapping("initCustomerForm/{formCode}")
-    }
+    public Result<String> initCustomerFormByCode(@RequestParam String customerId,
-
+                                                                @PathVariable(value = "formCode") String formCode){
-    @PostMapping
+        if (StringUtils.isBlank(customerId)){
-    public Result save(@RequestBody IcFormDTO dto){
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"参数错误");
-        //效验数据
+        }
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        return new Result<String>().ok(icFormService.initCustomerFormByCode(customerId,formCode));
-        icFormService.save(dto);
-        return new Result();
-    }
-
-    @PutMapping
-    public Result update(@RequestBody IcFormDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        icFormService.update(dto);
-        return new Result();
-    }
-
-    @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
-        //效验数据
-        AssertUtils.isArrayEmpty(ids, "id");
-        icFormService.delete(ids);
-        return new Result();
-    }
-
-    @GetMapping("export")
-    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<IcFormDTO> list = icFormService.list(params);
-        ExcelUtils.exportExcelToTarget(response, null, list, IcFormExcel.class);
     }
 
-
     /**
      * 获取居民信息表单 【dynamic=null】查询全部；否则查询对应的item
      *

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

@@ -17,25 +17,16 @@
 
 package com.epmet.controller;
 
-import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.validator.AssertUtils;
-import com.epmet.commons.tools.validator.ValidatorUtils;
-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;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
-import java.util.Map;
 
 
 /**
@@ -47,52 +38,10 @@ import java.util.Map;
 @RestController
 @RequestMapping("icformitem")
 public class IcFormItemController {
-    
+
     @Autowired
     private IcFormItemService icFormItemService;
 
-    @GetMapping("page")
-    public Result<PageData<IcFormItemDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<IcFormItemDTO> page = icFormItemService.page(params);
-        return new Result<PageData<IcFormItemDTO>>().ok(page);
-    }
-
-    @GetMapping("{id}")
-    public Result<IcFormItemDTO> get(@PathVariable("id") String id){
-        IcFormItemDTO data = icFormItemService.get(id);
-        return new Result<IcFormItemDTO>().ok(data);
-    }
-
-    @PostMapping
-    public Result save(@RequestBody IcFormItemDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        icFormItemService.save(dto);
-        return new Result();
-    }
-
-    @PutMapping
-    public Result update(@RequestBody IcFormItemDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        icFormItemService.update(dto);
-        return new Result();
-    }
-
-    @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
-        //效验数据
-        AssertUtils.isArrayEmpty(ids, "id");
-        icFormItemService.delete(ids);
-        return new Result();
-    }
-
-    @GetMapping("export")
-    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<IcFormItemDTO> list = icFormItemService.list(params);
-        ExcelUtils.exportExcelToTarget(response, null, list, IcFormItemExcel.class);
-    }
-
     /**
      * @Author sun
      * @Description 居民信息新增查询各表必填字段
@@ -102,4 +51,4 @@ public class IcFormItemController {
         return new Result<List<ColumnTableNameResultDTO>>().ok(icFormItemService.getMustColumn(customerId));
     }
 
-}
+}

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

@@ -18,8 +18,6 @@
 package com.epmet.service;
 
 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;
@@ -28,7 +26,6 @@ import com.epmet.dto.result.TableHeaderResultDTO;
 import com.epmet.entity.IcFormItemEntity;
 
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 /**
@@ -38,67 +35,6 @@ import java.util.Set;
  * @since v1.0.0 2021-10-26
  */
 public interface IcFormItemService extends BaseService<IcFormItemEntity> {
-
-    /**
-     * 默认分页
-     *
-     * @param params
-     * @return PageData<IcFormItemDTO>
-     * @author generator
-     * @date 2021-10-26
-     */
-    PageData<IcFormItemDTO> page(Map<String, Object> params);
-
-    /**
-     * 默认查询
-     *
-     * @param params
-     * @return java.util.List<IcFormItemDTO>
-     * @author generator
-     * @date 2021-10-26
-     */
-    List<IcFormItemDTO> list(Map<String, Object> params);
-
-    /**
-     * 单条查询
-     *
-     * @param id
-     * @return IcFormItemDTO
-     * @author generator
-     * @date 2021-10-26
-     */
-    IcFormItemDTO get(String id);
-
-    /**
-     * 默认保存
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2021-10-26
-     */
-    void save(IcFormItemDTO dto);
-
-    /**
-     * 默认更新
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2021-10-26
-     */
-    void update(IcFormItemDTO dto);
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return void
-     * @author generator
-     * @date 2021-10-26
-     */
-    void delete(String[] ids);
-
     /**
      * 获取居民信息的查询条件，组件列表
      *
@@ -122,4 +58,4 @@ public interface IcFormItemService extends BaseService<IcFormItemEntity> {
      * @Description 居民信息新增查询各表必填字段
      **/
     List<ColumnTableNameResultDTO> getMustColumn(String customerId);
-}
+}

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

@@ -18,15 +18,12 @@
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
-import com.epmet.commons.tools.page.PageData;
-import com.epmet.dto.IcFormDTO;
 import com.epmet.dto.form.CustomerFormQueryDTO;
 import com.epmet.dto.result.CustomerFormResultDTO;
 import com.epmet.dto.result.FormItemResult;
 import com.epmet.entity.IcFormEntity;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 配置表单
@@ -35,67 +32,6 @@ import java.util.Map;
  * @since v1.0.0 2021-10-26
  */
 public interface IcFormService extends BaseService<IcFormEntity> {
-
-    /**
-     * 默认分页
-     *
-     * @param params
-     * @return PageData<IcFormDTO>
-     * @author generator
-     * @date 2021-10-26
-     */
-    PageData<IcFormDTO> page(Map<String, Object> params);
-
-    /**
-     * 默认查询
-     *
-     * @param params
-     * @return java.util.List<IcFormDTO>
-     * @author generator
-     * @date 2021-10-26
-     */
-    List<IcFormDTO> list(Map<String, Object> params);
-
-    /**
-     * 单条查询
-     *
-     * @param id
-     * @return IcFormDTO
-     * @author generator
-     * @date 2021-10-26
-     */
-    IcFormDTO get(String id);
-
-    /**
-     * 默认保存
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2021-10-26
-     */
-    void save(IcFormDTO dto);
-
-    /**
-     * 默认更新
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2021-10-26
-     */
-    void update(IcFormDTO dto);
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return void
-     * @author generator
-     * @date 2021-10-26
-     */
-    void delete(String[] ids);
-
     /**
      * 获取居民信息表单
      *
@@ -116,4 +52,6 @@ public interface IcFormService extends BaseService<IcFormEntity> {
      * @date 2021.10.27 17:41:59
      */
     List<FormItemResult> listItems(String customerId, String formCode);
+
+    String initCustomerFormByCode(String customerId, String formCode);
 }

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

@@ -49,59 +49,6 @@ import java.util.*;
 @Service
 public class IcFormItemServiceImpl extends BaseServiceImpl<IcFormItemDao, IcFormItemEntity> implements IcFormItemService {
 
-
-    @Override
-    public PageData<IcFormItemDTO> page(Map<String, Object> params) {
-        IPage<IcFormItemEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, IcFormItemDTO.class);
-    }
-
-    @Override
-    public List<IcFormItemDTO> list(Map<String, Object> params) {
-        List<IcFormItemEntity> entityList = baseDao.selectList(getWrapper(params));
-
-        return ConvertUtils.sourceToTarget(entityList, IcFormItemDTO.class);
-    }
-
-    private QueryWrapper<IcFormItemEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
-
-        QueryWrapper<IcFormItemEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
-        return wrapper;
-    }
-
-    @Override
-    public IcFormItemDTO get(String id) {
-        IcFormItemEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, IcFormItemDTO.class);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void save(IcFormItemDTO dto) {
-        IcFormItemEntity entity = ConvertUtils.sourceToTarget(dto, IcFormItemEntity.class);
-        insert(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(IcFormItemDTO dto) {
-        IcFormItemEntity entity = ConvertUtils.sourceToTarget(dto, IcFormItemEntity.class);
-        updateById(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void delete(String[] ids) {
-        // 逻辑删除（@TableLogic 注解）
-        baseDao.deleteBatchIds(Arrays.asList(ids));
-    }
-
     /**
      * 获取居民信息的查询条件，组件列表
      *
@@ -171,4 +118,4 @@ public class IcFormItemServiceImpl extends BaseServiceImpl<IcFormItemDao, IcForm
         return baseDao.getMustColumn(customerId);
     }
 
-}
+}

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

@@ -18,18 +18,12 @@
 package com.epmet.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
-import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
-import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.IcFormDao;
-import com.epmet.dto.IcFormDTO;
 import com.epmet.dto.form.CustomerFormQueryDTO;
 import com.epmet.dto.result.CustomerFormResultDTO;
 import com.epmet.dto.result.FormGroupDTO;
@@ -37,14 +31,10 @@ import com.epmet.dto.result.FormItemResult;
 import com.epmet.entity.IcFormEntity;
 import com.epmet.redis.CustomerFootBarRedis;
 import com.epmet.service.IcFormService;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 配置表单
@@ -55,63 +45,11 @@ import java.util.Map;
 @Service
 public class IcFormServiceImpl extends BaseServiceImpl<IcFormDao, IcFormEntity> implements IcFormService {
    @Autowired
-    private CustomerFootBarRedis customerFootBarRedis;
+   private CustomerFootBarRedis customerFootBarRedis;
 
    @Autowired
    private RedisUtils redisUtils;
 
-    @Override
-    public PageData<IcFormDTO> page(Map<String, Object> params) {
-        IPage<IcFormEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, IcFormDTO.class);
-    }
-
-    @Override
-    public List<IcFormDTO> list(Map<String, Object> params) {
-        List<IcFormEntity> entityList = baseDao.selectList(getWrapper(params));
-
-        return ConvertUtils.sourceToTarget(entityList, IcFormDTO.class);
-    }
-
-    private QueryWrapper<IcFormEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
-
-        QueryWrapper<IcFormEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
-        return wrapper;
-    }
-
-    @Override
-    public IcFormDTO get(String id) {
-        IcFormEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, IcFormDTO.class);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void save(IcFormDTO dto) {
-        IcFormEntity entity = ConvertUtils.sourceToTarget(dto, IcFormEntity.class);
-        insert(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(IcFormDTO dto) {
-        IcFormEntity entity = ConvertUtils.sourceToTarget(dto, IcFormEntity.class);
-        updateById(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void delete(String[] ids) {
-        // 逻辑删除（@TableLogic 注解）
-        baseDao.deleteBatchIds(Arrays.asList(ids));
-    }
-
     /**
      * 获取居民信息表单
      *
@@ -165,4 +103,16 @@ public class IcFormServiceImpl extends BaseServiceImpl<IcFormDao, IcFormEntity>
 
         return formItemResults;
     }
+
+    @Override
+    public String initCustomerFormByCode(String customerId, String formCode) {
+        CustomerFormResultDTO formResultDTO = baseDao.selectByCode(customerId, formCode);
+        if (formResultDTO == null){
+            return "该客户已经存在了表单的数据";
+        }
+        CustomerFormResultDTO defaultIcForm = baseDao.selectByCode("default", formCode);
+
+
+        return null;
+    }
 }