openapi修改

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/controller/SuperviseController.java

@@ -7,6 +7,7 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.*;
 import com.yeejoin.amos.api.openapi.face.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import net.sf.json.JSONObject;
 import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -71,11 +72,14 @@ public class SuperviseController {
     @Autowired
     private UnitLicenceService unitLicenceService;
 
+    @Autowired
+    private TechInfoService techInfoService;
+
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @ApiOperation(value = "新增设计信息")
     @PostMapping(value = "/designInfo")
     @RestEventTrigger(value = "openapiLogEventHandler")
-    public ResponseModel<String> saveDesignInfo (@RequestBody List<DesignInfoModel> designInfo) throws Exception
+    public ResponseModel<String> saveDesignInfo (@RequestBody List<DesignInfo> designInfo) throws Exception
     {
         return ResponseHelper.buildResponse(designInfoService.saveDesignInfo(designInfo));
     }
@@ -204,4 +208,13 @@ public class SuperviseController {
     public ResponseModel<List<UnitLicenceModel>> getLicenceInfo (@RequestParam String unitCode) {
         return ResponseHelper.buildResponse(unitLicenceService.getLicenceInfo(unitCode));
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @ApiOperation(value = "新增特种设备附件资料信息")
+    @PostMapping(value = "/techInfo")
+    @RestEventTrigger(value = "openapiLogEventHandler")
+    public ResponseModel<String> saveTechInfo (@RequestBody List<JSONObject> techInfo)
+    {
+        return ResponseHelper.buildResponse(techInfoService.saveTechInfo(techInfo));
+    }
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/enums/EquipTypeEnum.java

+package com.yeejoin.amos.api.openapi.enums;
+
+import com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamBoiler;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@AllArgsConstructor
+@Getter
+public enum EquipTypeEnum {
+    elevator("elevator","com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamElevator","com.yeejoin.amos.api.openapi.face.service.EquipTechParamElevatorService"),
+    lifting("lifting","com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamLifting","com.yeejoin.amos.api.openapi.face.service.EquipTechParamLiftingService"),
+    vehicle("vehicle","com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamVehicle","com.yeejoin.amos.api.openapi.face.service.EquipTechParamVehicleService"),
+    ropeway("ropeway","com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamRopeway","com.yeejoin.amos.api.openapi.face.service.EquipTechParamRopewayService"),
+    rides("rides","com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamRides","com.yeejoin.amos.api.openapi.face.service.EquipTechParamRidesService"),
+    boiler("boiler","com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamBoiler","com.yeejoin.amos.api.openapi.face.service.EquipTechParamBoilerService"),
+    vessel("vessel","com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamVessel","com.yeejoin.amos.api.openapi.face.service.EquipTechParamVesselService"),
+    pipeline("pipeline","com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamPipeline","com.yeejoin.amos.api.openapi.face.service.EquipTechParamPipelineService");
+
+    String type;
+    String classPath;
+    String servicePath;
+
+    public static Map<String,String> classPathmap = new HashMap<>();
+    public static Map<String,String> servicePathmap = new HashMap<>();
+
+    static {
+        for(EquipTypeEnum e: EquipTypeEnum.values()){
+            classPathmap.put(e.type, e.classPath);
+            servicePathmap.put(e.type, e.servicePath);
+        }
+    }
+}

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/EquipTechParamBoilerMapper.java

+package com.yeejoin.amos.api.openapi.face.orm.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamBoiler;
+import lombok.Data;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface EquipTechParamBoilerMapper extends BaseMapper<EquipTechParamBoiler> {
+}

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/EquipTechParamElevatorMapper.java

+package com.yeejoin.amos.api.openapi.face.orm.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamElevator;
+
+public interface EquipTechParamElevatorMapper extends BaseMapper<EquipTechParamElevator> {
+}

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/EquipTechParamLiftingMapper.java

+package com.yeejoin.amos.api.openapi.face.orm.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamLifting;
+
+public interface EquipTechParamLiftingMapper extends BaseMapper<EquipTechParamLifting> {
+}

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/EquipTechParamPipelineMapper.java

+package com.yeejoin.amos.api.openapi.face.orm.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamPipeline;
+
+public interface EquipTechParamPipelineMapper extends BaseMapper<EquipTechParamPipeline> {
+}

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/EquipTechParamRidesMapper.java

+package com.yeejoin.amos.api.openapi.face.orm.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamRides;
+
+public interface EquipTechParamRidesMapper extends BaseMapper<EquipTechParamRides> {
+}

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/EquipTechParamRopewayMapper.java

+package com.yeejoin.amos.api.openapi.face.orm.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamRopeway;
+
+public interface EquipTechParamRopewayMapper extends BaseMapper<EquipTechParamRopeway> {
+}

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/EquipTechParamVehicleMapper.java

+package com.yeejoin.amos.api.openapi.face.orm.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamVehicle;
+
+public interface EquipTechParamVehicleMapper extends BaseMapper<EquipTechParamVehicle> {
+}

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/EquipTechParamVesselMapper.java

+package com.yeejoin.amos.api.openapi.face.orm.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamVessel;
+
+public interface EquipTechParamVesselMapper extends BaseMapper<EquipTechParamVessel> {
+}

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/DesignInfoService.java

@@ -37,33 +37,33 @@ public class DesignInfoService extends AppBaseService<DesignInfoModel, DesignInf
      * @return  成功返回“ok” 失败返回“Access_token无效”
      */
     @Transactional(rollbackFor= {Exception.class})
-    public String saveDesignInfo(List<DesignInfoModel> model) {
+    public String saveDesignInfo(List<DesignInfo> model) {
         // TODO Auto-generated method stub
         if (ValidationUtil.isEmpty(model)) {
             throw new BadRequest("设计信息为空.");
         }
 
-        List<JgFile> fileList = new ArrayList<>();
-        List<JgFile> designCodeList , designFileList;
+//        List<JgFile> fileList = new ArrayList<>();
+//        List<JgFile> designCodeList , designFileList;
 
-        for (DesignInfoModel designInfoModel : model) {
+        for (DesignInfo DesignInfo : model) {
 
-//            checkModel(designInfoModel);
-            designInfoModel.setRecDate(new Date());
-            designInfoModel.setAppId(getAppId());
+//            checkModel(DesignInfo);
+            DesignInfo.setRecDate(new Date());
+            DesignInfo.setAppId(getAppId());
 
-            DesignInfoModel designInfo = this.createWithModel(designInfoModel);
+            this.save(DesignInfo);
 
-//            designFileList = JSONObject.parseArray(JSONObject.toJSONString(designInfoModel.getDesignFile()), JgFile.class);
-//            designCodeList = JSONObject.parseArray(JSONObject.toJSONString(designInfoModel.getDesignCode()), JgFile.class);
+//            designFileList = JSONObject.parseArray(JSONObject.toJSONString(DesignInfo.getDesignFile()), JgFile.class);
+//            designCodeList = JSONObject.parseArray(JSONObject.toJSONString(DesignInfo.getDesignCode()), JgFile.class);
 //
 //            for (JgFile files : designFileList) {
 //                JgFile file = new JgFile();
-//                file.setSequenceCode(designInfoModel.getSequenceCode());
+//                file.setSequenceCode(DesignInfo.getSequenceCode());
 //                file.setAppId(getAppId());
 //                file.setObjectType(JgFileObjectEnum.DESIGN_INFO.getObject());
 //                file.setAttributeType(JgFileAttributeEnum.DESIGN_FILE.getAttribute());
-//                file.setSyncDate(designInfoModel.getSyncDate());
+//                file.setSyncDate(DesignInfo.getSyncDate());
 //                file.setFileUrl(files.getFileUrl());
 //                file.setFileName(files.getFileName());
 //                file.setRecDate(new Date());
@@ -73,11 +73,11 @@ public class DesignInfoService extends AppBaseService<DesignInfoModel, DesignInf
 //
 //            for (JgFile files : designCodeList) {
 //                JgFile file = new JgFile();
-//                file.setSequenceCode(designInfoModel.getSequenceCode());
+//                file.setSequenceCode(DesignInfo.getSequenceCode());
 //                file.setAppId(getAppId());
 //                file.setObjectType(JgFileObjectEnum.DESIGN_INFO.getObject());
 //                file.setAttributeType(JgFileAttributeEnum.DESIGN_CODE.getAttribute());
-//                file.setSyncDate(designInfoModel.getSyncDate());
+//                file.setSyncDate(DesignInfo.getSyncDate());
 //                file.setFileUrl(files.getFileUrl());
 //                file.setFileName(files.getFileName());
 //                file.setRecDate(new Date());
@@ -95,7 +95,7 @@ public class DesignInfoService extends AppBaseService<DesignInfoModel, DesignInf
      *
      * @param models
      */
-//    private static void checkModel(DesignInfoModel models) {
+//    private static void checkModel(DesignInfo models) {
 //        if(ValidationUtil.isEmpty(models.getSequenceCode())) {
 //            throw new BadRequest("设备唯一标识码不能为空！");
 //        }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/EquipTechParamBoilerService.java

+package com.yeejoin.amos.api.openapi.face.service;
+
+import com.yeejoin.amos.api.openapi.face.model.EquipTechParamBoilerModel;
+import com.yeejoin.amos.api.openapi.face.orm.dao.EquipTechParamBoilerMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamBoiler;
+import org.springframework.stereotype.Service;
+
+@Service
+public class EquipTechParamBoilerService extends AppBaseService<EquipTechParamBoilerModel, EquipTechParamBoiler, EquipTechParamBoilerMapper>{
+}

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/EquipTechParamElevatorService.java

+package com.yeejoin.amos.api.openapi.face.service;
+
+import com.yeejoin.amos.api.openapi.face.orm.dao.EquipTechParamElevatorMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamElevator;
+import org.springframework.stereotype.Service;
+
+@Service
+public class EquipTechParamElevatorService extends AppBaseService<EquipTechParamElevatorMapper, EquipTechParamElevator,EquipTechParamElevatorMapper> {
+}

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/EquipTechParamLiftingService.java

+package com.yeejoin.amos.api.openapi.face.service;
+
+import com.yeejoin.amos.api.openapi.face.model.EquipTechParamLiftingModel;
+import com.yeejoin.amos.api.openapi.face.orm.dao.EquipTechParamLiftingMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamLifting;
+import org.springframework.stereotype.Service;
+
+@Service
+public class EquipTechParamLiftingService extends AppBaseService<EquipTechParamLiftingModel, EquipTechParamLifting, EquipTechParamLiftingMapper> {
+}

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/EquipTechParamPipelineService.java

+package com.yeejoin.amos.api.openapi.face.service;
+
+import com.yeejoin.amos.api.openapi.face.model.EquipTechParamPipelineModel;
+import com.yeejoin.amos.api.openapi.face.orm.dao.EquipTechParamPipelineMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamPipeline;
+import org.springframework.stereotype.Service;
+
+@Service
+public class EquipTechParamPipelineService extends AppBaseService<EquipTechParamPipelineModel, EquipTechParamPipeline, EquipTechParamPipelineMapper>{
+}

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/EquipTechParamRidesService.java

+package com.yeejoin.amos.api.openapi.face.service;
+
+import com.yeejoin.amos.api.openapi.face.model.EquipTechParamRidesModel;
+import com.yeejoin.amos.api.openapi.face.orm.dao.EquipTechParamRidesMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamRides;
+import org.springframework.stereotype.Service;
+
+@Service
+public class EquipTechParamRidesService extends AppBaseService<EquipTechParamRidesModel, EquipTechParamRides, EquipTechParamRidesMapper>{
+}

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/EquipTechParamRopewayService.java

+package com.yeejoin.amos.api.openapi.face.service;
+
+import com.yeejoin.amos.api.openapi.face.model.EquipTechParamRopewayModel;
+import com.yeejoin.amos.api.openapi.face.orm.dao.EquipTechParamRopewayMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamRopeway;
+import org.springframework.stereotype.Service;
+
+@Service
+public class EquipTechParamRopewayService extends AppBaseService<EquipTechParamRopewayModel, EquipTechParamRopeway, EquipTechParamRopewayMapper> {
+}

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/EquipTechParamVehicleService.java

+package com.yeejoin.amos.api.openapi.face.service;
+
+import com.yeejoin.amos.api.openapi.face.model.EquipTechParamVehicleModel;
+import com.yeejoin.amos.api.openapi.face.orm.dao.EquipTechParamVehicleMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamVehicle;
+import org.springframework.stereotype.Service;
+
+@Service
+public class EquipTechParamVehicleService extends AppBaseService<EquipTechParamVehicleModel, EquipTechParamVehicle,EquipTechParamVehicleMapper>{
+}

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/EquipTechParamVesselService.java

+package com.yeejoin.amos.api.openapi.face.service;
+
+import com.yeejoin.amos.api.openapi.face.model.EquipTechParamVesselModel;
+import com.yeejoin.amos.api.openapi.face.orm.dao.EquipTechParamVesselMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamVessel;
+import org.springframework.stereotype.Service;
+
+@Service
+public class EquipTechParamVesselService extends AppBaseService<EquipTechParamVesselModel, EquipTechParamVessel, EquipTechParamVesselMapper>{
+}