装备表单新增编辑提交

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/dto/FormGroupColumnDto.java → amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/dto/FormGroupColumnEquipDto.java

@@ -9,7 +9,7 @@ import lombok.Data;
  */
 @Data
 @ApiModel(value = "FormGroupColumnDto对象", description = "分组Dto对象")
-public class FormGroupColumnDto {
+public class FormGroupColumnEquipDto {
 
     @ApiModelProperty(value = "字段名")
     private String fieldName;

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/FormInstanceController.java

 package com.yeejoin.equipmanage.controller;
 
-import com.yeejoin.equipmanage.common.entity.FormGroupColumn;
-import com.yeejoin.equipmanage.common.entity.dto.FormGroupColumnDto;
-import com.yeejoin.equipmanage.service.IFormGroupColumnService;
-import com.yeejoin.equipmanage.service.IFormInstanceService;
+import com.yeejoin.equipmanage.common.entity.dto.FormGroupColumnEquipDto;
+import com.yeejoin.equipmanage.config.PersonIdentify;
+import com.yeejoin.equipmanage.service.IFormInstanceEquipService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -31,15 +28,39 @@ public class FormInstanceController extends AbstractBaseController {
 
 
     @Autowired
-    private IFormInstanceService formInstanceService;
+    private IFormInstanceEquipService formInstanceEquipService;
+
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "通过分组code查询列及值信息", notes = "通过分组code查询列及值信息")
     @RequestMapping(value = "/queryColumnAndValueByGroup", method = RequestMethod.GET)
-    public List<FormGroupColumnDto> queryColumnAndValueByGroup(@RequestParam String groupCode, @RequestParam(required = false) Long instanceId) {
-        return formInstanceService.queryColumnAndValueByGroup(groupCode, instanceId);
+    public List<FormGroupColumnEquipDto> queryColumnAndValueByGroup(@RequestParam String groupCode, @RequestParam(required = false) Long instanceId) {
+        return formInstanceEquipService.queryColumnAndValueByGroup(groupCode, instanceId);
     }
 
+
+    @PostMapping(value = "/commonSave")
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "通用保存")
+    @PersonIdentify
+    public Object save(
+            @RequestParam(value = "groupCode") String groupCode,
+            @RequestParam(value = "instanceId", required = false) String instanceId,
+            @RequestBody Map<String, Object> map) {
+        String orgCode = getOrgCode();
+        return formInstanceEquipService.saveForm(groupCode, orgCode, map, instanceId);
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "通用更新")
+    @PutMapping(value = "/commonUpdate")
+    public Object update(
+            @RequestParam Long instanceId,
+            @RequestParam(value = "groupCode", required = false) String groupCode,
+            @RequestBody Map<String, Object> map) {
+        String orgCode = getOrgCode();
+        return formInstanceEquipService.updateForm(instanceId, orgCode, map, groupCode);
+    }
 }
 
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IFormInstanceEquipService.java

@@ -2,10 +2,54 @@ package com.yeejoin.equipmanage.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.equipmanage.common.entity.FormInstanceEquip;
+import com.yeejoin.equipmanage.common.entity.dto.FormGroupColumnEquipDto;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author DELL
  */
 public interface IFormInstanceEquipService extends IService<FormInstanceEquip> {
 
+    List<FormGroupColumnEquipDto> queryColumnAndValueByGroup(String groupCode, Long instanceId);
+
+    /**
+     * 通用表单保存
+     *
+     * @param groupCode   表单类型
+     * @param orgCode 公司编号
+     * @param map         form
+     * @param caseId 实例ID
+     * @return Object
+     */
+    Object saveForm(String groupCode, String orgCode, Map<String, Object> map, String instanceId);
+
+    /**
+     * 创建
+     *
+     * @param groupCode   分类
+     * @param companyCode 公司编码
+     * @param map         字段值对象
+     * @return Map<String, Object>
+     */
+    Map<String, Object> createByMap(String groupCode, String companyCode, Map<String, Object> map, String caseId);
+
+    /**
+     * 通用表单更新
+     *
+     * @param instanceId 实例id
+     * @param companyCode 公司编号
+     * @param map         form
+     * @return Object
+     */
+    Object updateForm(Long instanceId, String companyCode, Map<String, Object> map, String groupCode);
+
+    /**
+     * 删除
+     *
+     * @param instanceId 实例id
+     * @return 是否成功
+     */
+    Boolean deleteInstanceById(Long instanceId);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IFormInstanceService.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.equipmanage.common.entity.FormInstance;
 import com.yeejoin.equipmanage.common.entity.dto.BuildSearchDTO;
-import com.yeejoin.equipmanage.common.entity.dto.FormGroupColumnDto;
+import com.yeejoin.equipmanage.common.entity.dto.FormGroupColumnEquipDto;
 import com.yeejoin.equipmanage.common.entity.vo.BuildingVideoListVO;
 import com.yeejoin.equipmanage.common.vo.UnitAreaTreeVo;
 
@@ -173,5 +173,5 @@ public interface IFormInstanceService extends IService<FormInstance> {
      */
     List<Map<String, Object>> getSpecialChildrenListByName(String parentId, String bizOrgCode, String name);
 
-    List<FormGroupColumnDto> queryColumnAndValueByGroup(String groupCode, Long instanceId);
+    List<FormGroupColumnEquipDto> queryColumnAndValueByGroup(String groupCode, Long instanceId);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java

@@ -162,6 +162,9 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
     @Autowired
     private IFormInstanceService formInstanceService;
 
+    @Autowired
+    private IFormInstanceEquipService formInstanceEquipService;
+
     @Value("${systemctl.dict.iot-core-param}")
     private String iotCoreParam;
 
@@ -203,6 +206,9 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
     FormInstanceMapper formInstanceMapper;
 
     @Autowired
+    FormInstanceEquipMapper formInstanceEquipMapper;
+
+    @Autowired
     EquipmentSpecificIndexMapper equipmentSpecificIndexMapper;
 
     @Value("${systemctl.sync.switch}")
@@ -1018,7 +1024,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
         }
         if (res > 0) {
             // 删除设备动态表单扩展属性
-            return formInstanceService.deleteInstanceById(id);
+            return formInstanceEquipService.deleteInstanceById(id);
         } else {
             return false;
         }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FormInstanceEquipServiceImpl.java

 package com.yeejoin.equipmanage.service.impl;
 
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yeejoin.equipmanage.common.entity.FormInstanceEquip;
+import com.yeejoin.equipmanage.common.entity.*;
+import com.yeejoin.equipmanage.common.entity.dto.FormGroupColumnEquipDto;
+import com.yeejoin.equipmanage.common.enums.GroupCodeEnum;
+import com.yeejoin.equipmanage.common.enums.GroupColumnDataType;
+import com.yeejoin.equipmanage.common.utils.CommonResponseUtil;
+import com.yeejoin.equipmanage.common.utils.RandomUtil;
+import com.yeejoin.equipmanage.context.SpringContextHolder;
+import com.yeejoin.equipmanage.event.SyncRiskEvent;
+import com.yeejoin.equipmanage.mapper.FormGroupEquipMapper;
 import com.yeejoin.equipmanage.mapper.FormInstanceEquipMapper;
+import com.yeejoin.equipmanage.operation.SyncRiskOperator;
+import com.yeejoin.equipmanage.service.IFormGroupColumnEquipService;
+import com.yeejoin.equipmanage.service.IFormGroupEquipService;
 import com.yeejoin.equipmanage.service.IFormInstanceEquipService;
+import com.yeejoin.equipmanage.service.IFormInstanceService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.typroject.tyboot.core.foundation.exception.BaseException;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.foundation.utils.StringUtil;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author DELL
@@ -13,4 +42,194 @@ import org.springframework.stereotype.Service;
 @Service
 public class FormInstanceEquipServiceImpl extends ServiceImpl<FormInstanceEquipMapper, FormInstanceEquip> implements IFormInstanceEquipService {
 
+    @Autowired
+    private IFormGroupColumnEquipService formGroupColumnEquipService;
+
+    @Autowired
+    private IFormInstanceEquipService formInstanceEquipService;
+
+    @Autowired
+    private IFormGroupEquipService formGroupEquipService;
+
+    @Autowired
+    private FormInstanceEquipMapper formInstanceEquipMapper;
+
+    @Autowired
+    private Sequence sequence;
+
+    final static String[] list = {"92031900", "92011000", "92010700"};
+
+    private final String CODE = "code";
+
+    private final String ORGCODE = "orgCode";
+
+
+    @Override
+    public List<FormGroupColumnEquipDto> queryColumnAndValueByGroup(String groupCode, Long instanceId) {
+        List<FormGroupColumnEquipDto> list = new ArrayList<>();
+        List<FormGroupColumnEquip> columnList = formGroupColumnEquipService.queryByGroup(groupCode);
+        if (!CollectionUtils.isEmpty(columnList)) {
+            Map<String, Object> map = queryForMap(instanceId);
+            columnList.forEach(x -> {
+                FormGroupColumnEquipDto dto = new FormGroupColumnEquipDto();
+                BeanUtils.copyProperties(x, dto);
+                if (!map.isEmpty()) {
+                    dto.setFieldValue(map.get(dto.getFieldName()).toString());
+                }
+                list.add(dto);
+            });
+        }
+        return list;
+    }
+
+    private String fillCode(String groupCode, String fieldName, String value, String companyCode) {
+        if (CODE.equals(fieldName) && StringUtils.isEmpty(value)) {
+            return RandomUtil.buildNo(GroupCodeEnum.getInstance(groupCode).getSequenceType(), companyCode);
+        } else if (ORGCODE.equals(fieldName) && StringUtils.isEmpty(value)) {
+            return companyCode;
+        }
+        return value == null ? "" : value;
+    }
+
+    private String checkAndFillCode(String companyCode, Map<String, Object> map, String groupCode, FormGroupColumnEquip optionModel) {
+        Object value = map.get(optionModel.getFieldName());
+        String stringValue = this.fillCode(groupCode, optionModel.getFieldName(), value == null ? null : String.valueOf(value), companyCode);
+        // 检验code重复
+        if ("code".equals(optionModel.getFieldName())) {
+            String instanceId = String.valueOf(map.get("instanceId"));
+            int count = this.count(new QueryWrapper<FormInstanceEquip>().eq("field_value", stringValue).eq("field_name", "code").ne("instance_id", instanceId == null ? "" : instanceId));
+            if (count > 0) {
+                if (value == null) {
+                    stringValue = checkAndFillCode(companyCode, map, groupCode, optionModel);
+                } else {
+                    throw new BadRequest("编码重复！");
+                }
+            }
+        }
+        if (StringUtils.isEmpty(stringValue) && optionModel.getNotNull()) {
+            throw new BadRequest(optionModel.getFieldLabel() + " 不能为空");
+        }
+        return stringValue;
+    }
+
+    private Map<String, Object> queryForMap(Long instanceId) {
+        Map<String, Object> optionListMap = new HashMap<>();
+        List<FormInstanceEquip> list = this.queryByInstanceId(instanceId);
+        if (!CollectionUtils.isEmpty(list)) {
+            List<FormGroupColumnEquip> optionList = formGroupColumnEquipService.queryByGroup(list.iterator().next().getGroupCode());
+            optionListMap = Bean.listToMap(optionList, "fieldName", "fieldLabel", FormGroupColumnEquip.class);
+            Map instanceMap = Bean.listToMap(list, "fieldName", "fieldValue", FormInstanceEquip.class);
+            for (FormGroupColumnEquip optionModel : optionList) {
+                instanceMap.put(optionModel.getFieldName(), this.dataTypeProcess(optionModel.getFieldName(), instanceMap.get(optionModel.getFieldName()), optionModel.getDataType(), instanceMap));
+            }
+            optionListMap.putAll(instanceMap);
+            optionListMap.put("instanceId", instanceId);
+            optionListMap.put("createTime", list.iterator().next().getCreateDate());
+            optionListMap.put("groupCode", list.iterator().next().getGroupCode());
+        }
+        return optionListMap;
+    }
+
+    private Object dataTypeProcess(String fieldName, Object value, String dataType, Map instanceMap) {
+        Object retValue = value;
+        if (!ValidationUtil.isEmpty(value)) {
+            GroupColumnDataType optionDataType = GroupColumnDataType.valueOf(dataType);
+            switch (optionDataType) {
+                case InstanceId:
+                    List<Long> instanceIds = StringUtil.String2LongList(String.valueOf(value));
+                    List<Map<String, Object>> mapList = new ArrayList<>();
+                    instanceIds.forEach((id) -> mapList.add(queryForMap(id)));
+                    retValue = mapList;
+                    break;
+                case Enum:
+                    Map<String, Map<String, Object>> map = formGroupColumnEquipService.processEnumData(fieldName, String.valueOf(value));
+                    instanceMap.putAll(map);
+                    break;
+                default:
+                    break;
+            }
+        }
+        return retValue;
+    }
+
+    public List<FormInstanceEquip> queryByInstanceId(Long instanceId) {
+        QueryWrapper<FormInstanceEquip> wrapper = new QueryWrapper<>();
+        wrapper.eq("instance_id", instanceId);
+        return this.baseMapper.selectList(wrapper);
+    }
+
+    @Override
+    @Transactional(rollbackFor = {BaseException.class, Exception.class})
+    public Map<String, Object> createByMap(String groupCode, String companyCode, Map<String, Object> map, String caseId) {
+        //1.查询分组表数据，数据准备用
+        Map<String, Object> returnMap = new HashMap<>();
+        FormGroupEquip formGroup = formGroupEquipService.getByUniqueKey(groupCode);
+        //2.查询分组对应的动态表单字段
+        List<FormGroupColumnEquip> optionList = formGroupColumnEquipService.queryByGroup(groupCode);
+        if (CollectionUtils.isEmpty(map) || formGroup == null) {
+            return returnMap;
+        }
+        Long instanceId = sequence.nextId();
+        if (!ValidationUtil.isEmpty(Arrays.stream(list).filter(x -> x.equals(groupCode)).collect(Collectors.toList()))) {
+            instanceId = Long.valueOf(caseId);
+            returnMap.put("code", sequence.nextId());
+        }
+        List<FormInstanceEquip> entities = new ArrayList<>();
+        //3.以数据库现在配置的动态表单字段为准，进行数据插入的准备
+        for (FormGroupColumnEquip option : optionList) {
+            String stringValue = checkAndFillCode(companyCode, map, groupCode, option);
+            FormInstanceEquip formInstance = new FormInstanceEquip();
+            Bean.copyExistPropertis(option, formInstance);
+            buildEntry(instanceId, formGroup, entities, option, stringValue, formInstance);
+        }
+        //4.批量插入
+        this.saveBatch(entities);
+        //5.返回值对象(数据暂时未用到)
+        returnMap = Bean.listToMap(entities, "fieldName", "fieldValue", FormInstanceEquip.class);
+        returnMap.put("instanceId", entities.iterator().next().getInstanceId());
+        return returnMap;
+    }
+
+    private void buildEntry(Long instanceId, FormGroupEquip formGroup, List<FormInstanceEquip> entities, FormGroupColumnEquip optionModel, String stringValue, FormInstanceEquip formInstance) {
+        formInstance.setFieldName(optionModel.getFieldName());
+        formInstance.setFieldLabel(optionModel.getFieldLabel());
+        formInstance.setDataType(optionModel.getDataType());
+        formInstance.setGroupId(optionModel.getGroupId());
+        formInstance.setGroupCode(optionModel.getGroupCode());
+        formInstance.setQueryStrategy(optionModel.getQueryStrategy());
+
+        formInstance.setFieldValue(stringValue);
+        formInstance.setInstanceId(instanceId);
+        formInstance.setGroupColumnId(optionModel.getId());
+        formInstance.setId(sequence.nextId());
+        formInstance.setGroupType(formGroup.getGroupType());
+        formInstance.setCreateDate(new Date());
+        entities.add(formInstance);
+    }
+
+    @Override
+    public Object saveForm(String groupCode, String orgCode, Map<String, Object> map, String instanceId) {
+        Map<String, Object> formKeyMap = formInstanceEquipService.createByMap(groupCode, orgCode, map, instanceId);
+        if (com.yeejoin.equipmanage.common.utils.StringUtil.isNotEmpty(instanceId)) {
+            return CommonResponseUtil.success(formKeyMap);
+        }
+        return formKeyMap;
+    }
+
+    @Override
+    @Transactional(rollbackFor = {Exception.class, BaseException.class})
+    public Object updateForm(Long instanceId, String orgCode, Map<String, Object> map, String groupCode) {
+        if (com.yeejoin.equipmanage.common.utils.StringUtil.isNotEmpty(groupCode)) {
+            map.keySet().forEach(x -> {
+                formInstanceEquipMapper.updateFormFieldValue(instanceId, x, String.valueOf(map.get(x)));
+            });
+            return CommonResponseUtil.success();
+        }
+        return null;
+    }
+
+    @Override
+    public Boolean deleteInstanceById(Long instanceId) {
+        return this.baseMapper.delete(new QueryWrapper<FormInstanceEquip>().lambda().eq(FormInstanceEquip::getInstanceId, instanceId)) > 0;
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FormInstanceServiceImpl.java

@@ -13,7 +13,7 @@ import com.yeejoin.equipmanage.common.entity.FormGroupColumn;
 import com.yeejoin.equipmanage.common.entity.FormInstance;
 import com.yeejoin.equipmanage.common.entity.SourceFile;
 import com.yeejoin.equipmanage.common.entity.dto.BuildSearchDTO;
-import com.yeejoin.equipmanage.common.entity.dto.FormGroupColumnDto;
+import com.yeejoin.equipmanage.common.entity.dto.FormGroupColumnEquipDto;
 import com.yeejoin.equipmanage.common.entity.vo.BuildingVideoListVO;
 import com.yeejoin.equipmanage.common.enums.GroupCodeEnum;
 import com.yeejoin.equipmanage.common.enums.GroupColumnDataType;
@@ -574,13 +574,13 @@ public class FormInstanceServiceImpl extends ServiceImpl<FormInstanceMapper, For
     }
 
     @Override
-    public List<FormGroupColumnDto> queryColumnAndValueByGroup(String groupCode, Long instanceId) {
-        List<FormGroupColumnDto> list = new ArrayList<>();
+    public List<FormGroupColumnEquipDto> queryColumnAndValueByGroup(String groupCode, Long instanceId) {
+        List<FormGroupColumnEquipDto> list = new ArrayList<>();
         List<FormGroupColumn> columnList = iFormGroupColumnService.queryByGroup(groupCode);
         if (!CollectionUtils.isEmpty(columnList)) {
             Map<String, Object> map = queryForMap(instanceId);
             columnList.forEach(x -> {
-                FormGroupColumnDto dto = new FormGroupColumnDto();
+                FormGroupColumnEquipDto dto = new FormGroupColumnEquipDto();
                 BeanUtils.copyProperties(x, dto);
                 if (!map.isEmpty()) {
                     dto.setFieldValue(map.get(dto.getFieldName()).toString());