2024-03-21 13:42:36 模型测试优化

psdc-business/src/main/java/com/psdc/entity/SysDeviceHeatScene.java

@@ -8,32 +8,44 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 public class SysDeviceHeatScene {
-    //设备id
+    // 设备id
     private String id;
-    //设备类型
-    private String devType;
-    //设备细类
-    private String devSubType;
-    //技术类型
-    private String devTechType;
-    //热效率
-    private Double heatEfficiency;
-    //设备功率
-    private Double devPower;
-    //设备单价
-    private Double devPrice;
-    // 电替代设备年人工费用
-    private Double devSubstituteLaborCost;
-    // 原设备的人工费用
+    /** 设备类型 */
+    private String devType ;
+    /** 设备细类 */
+    private String devSubType ;
+    /** 技术类型 */
+    private String devTechType ;
+    /** 最少推荐使用人数 */
+    private Integer recomMinPeopleNum ;
+    /** 最多推荐使用人数 */
+    private Integer recomMaxPeopleNum ;
+    /** 热效率 */
+    private Double heatEfficiency ;
+    /** 设备功率（kW） */
+    private Double devPower ;
+    /** 设备单价（元） */
+    private Double devPrice ;
+    /** 电替代设备年人工费用（元） */
+    private Double devSubstituteLaborCost ;
+    /** 原设备的人工费用（元） */
     private Double laborCost ;
-    //单台设备可参考供暖面积
-    private Double devReferenceArea;
-    //设备使用年限
-    private Integer devServiceLife;
-    //设备年运行时长
-    private Integer devAnnualOperationTime;
-    //备注
-    private String remark;
+    /** 单台电设备参考的可供暖面积（平方米） */
+    private Double devReferenceArea ;
+    /** 单台电设备参考的工作容积（立方米） */
+    private Double devWorkArea ;
+    /** 产品密度（千克/立方米） */
+    private Double productDensity ;
+    /** 单台电设备制造一批产品的产量（kg） */
+    private Double manufactProduct ;
+    /** 单台电设备制造一批产品的周期（小时） */
+    private Double manufactCycle ;
+    /** 设备使用年限（年） */
+    private Integer devServiceLife ;
+    /** 设备年运行时长（小时） */
+    private Integer devAnnualOperationTime ;
+    /** 备注 */
+    private String remark ;
 
 
 }

psdc-business/src/main/java/com/psdc/enums/DeviceSubType.java

@@ -0,0 +1,40 @@
+package com.psdc.enums;
+
+
+public enum DeviceSubType {
+
+    Boiler_Heating(0101, "工业供热电锅炉"),
+    Kitchen_Cooking(0102, "电厨炊"),
+    Cooling_Heating(0201, "供冷/暖"),
+    Cooling_Heating_Electric_Boiler(0202, "供冷/暖电锅炉"),
+    Material_Kiln(0203, "建材电窑炉"),
+    Metal_Kiln(0204, "冶金窑炉"),
+    Metal_Kiln_Direct_Heat(0205, "直接加热电阻炉"),
+    Metal_Kiln_Interstitial_Heat(0206, "间接加热电阻炉（钟罩式光亮退火炉)"),
+    Metal_Kiln_Electric_Arc(0207, "电弧炉（钢包精炼LF炉）"),
+    Metal_Kiln_Induction(2180, "中/高频感应电炉");
+
+
+    /**
+     * 编码
+     */
+    private final Integer code;
+    /**
+     * 中文描述
+     */
+    private final String desc;
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    DeviceSubType(Integer code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+}

psdc-business/src/main/java/com/psdc/mapper/SysDeviceHeatSceneMapper.java

@@ -2,6 +2,7 @@ package com.psdc.mapper;
 
 import com.psdc.entity.SysDeviceHeatScene;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -22,5 +23,11 @@ public interface SysDeviceHeatSceneMapper {
      */
     List<SysDeviceHeatScene> selAllDevices();
 
+    /**
+     * 根据设备类型查询设备
+     * @param types 设备细类
+     * @return
+     */
+    List<SysDeviceHeatScene> selDevicesBySubType(@Param(value = "types") String types);
 
 }

psdc-business/src/main/java/com/psdc/service/impl/GenerateKeyIml.java

@@ -1,21 +1,14 @@
 package com.psdc.service.impl;
 
 
-import com.phcomponent.basictech.elementary.util.SM4Util;
 import com.psdc.service.IGenerateKey;
 import com.psdc.utils.Sm2Util;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.springframework.stereotype.Service;
 
-import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
 import javax.crypto.spec.SecretKeySpec;
 import java.nio.charset.StandardCharsets;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
 import java.security.Security;
 import java.util.Base64;
 import java.util.Map;

psdc-business/src/main/java/com/psdc/service/model/IBuildHeatingService.java

@@ -2,6 +2,7 @@ package com.psdc.service.model;
 
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
+import com.psdc.entity.SysDeviceHeatScene;
 
 import java.util.List;
 
@@ -19,5 +20,7 @@ public interface IBuildHeatingService {
 
     List selAllDevices();
 
+    List<SysDeviceHeatScene> selDevicesBySubType(String types);
+
 
 }

psdc-business/src/main/java/com/psdc/service/model/impl/BuildHeatingServiceImpl.java

@@ -60,4 +60,9 @@ public class BuildHeatingServiceImpl implements IBuildHeatingService {
         return deviceHeatSceneMapper.selAllDevices();
     }
 
+    @Override
+    public List<SysDeviceHeatScene> selDevicesBySubType(String types) {
+        return deviceHeatSceneMapper.selDevicesBySubType(types);
+    }
+
 }

psdc-business/src/main/resources/mapper/business/SysDeviceHeatSceneMapper.xml

@@ -7,12 +7,18 @@
         <result property="devType" column="dev_type" />
         <result property="devSubType" column="dev_sub_type" />
         <result property="devTechType" column="dev_tech_type" />
+        <result property="recomMinPeopleNum" column="recom_min_people_num" />
+        <result property="recomMaxPeopleNum" column="recom_max_people_num" />
         <result property="heatEfficiency" column="heat_efficiency" />
         <result property="devPower" column="dev_power" />
         <result property="devPrice" column="dev_price" />
         <result property="devSubstituteLaborCost" column="dev_substitute_labor_cost" />
         <result property="laborCost" column="labor_cost" />
         <result property="devReferenceArea" column="dev_reference_area" />
+        <result property="devWorkArea" column="dev_work_area" />
+        <result property="productDensity" column="product_density" />
+        <result property="manufactProduct" column="manufact_product" />
+        <result property="manufactCycle" column="manufact_cycle" />
         <result property="devServiceLife" column="dev_service_life" />
         <result property="devAnnualOperationTime" column="dev_annual_operation_time" />
         <result property="remark" column="remark" />
@@ -21,4 +27,8 @@
     <select id="selAllDevices" resultMap="SysDeviceHeatSceneMap">
         Select * From sys_device_heat_scene
     </select>
+
+    <select id="selDevicesBySubType" resultMap="SysDeviceHeatSceneMap">
+        Select * From sys_device_heat_scene where dev_sub_type In (#{types})
+    </select>
 </mapper>

psdc-web/src/main/java/com/psdc/controller/model/BuildHeatingController.java

@@ -2,6 +2,7 @@ package com.psdc.controller.model;
 
 import cn.hutool.json.JSONObject;
 import com.psdc.core.domain.AjaxResult;
+import com.psdc.enums.DeviceSubType;
 import com.psdc.service.model.IBuildHeatingService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -42,4 +43,27 @@ public class BuildHeatingController {
         return ajax;
     }
 
+    @PostMapping("/selByCoed")
+    public AjaxResult queryByType(@RequestParam(value="typeCoed") String typeCode) {
+        AjaxResult ajax = AjaxResult.success();
+        switch (typeCode){
+            case "0101":
+                String s = DeviceSubType.Cooling_Heating.getDesc() + "," + DeviceSubType.Cooling_Heating_Electric_Boiler.getDesc();
+                ajax.put("data", buildHeatingService.selDevicesBySubType(s));
+                return ajax;
+            case "0102":
+                ajax.put("data", buildHeatingService.selDevicesBySubType(DeviceSubType.Boiler_Heating.getDesc()));
+                return ajax;
+            case "0103" :
+                ajax.put("data", buildHeatingService.selDevicesBySubType(DeviceSubType.Cooling_Heating.getDesc()));
+                return ajax;
+            case "0104" :
+                ajax.put("data", buildHeatingService.selDevicesBySubType(DeviceSubType.Material_Kiln.getDesc()));
+                return ajax;
+            default:
+                ajax.put("data", buildHeatingService.selAllDevices());
+                return ajax;
+        }
+    }
+
 }