装备表单新增编辑提交

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/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());