diff --git a/psdc-business/lib/dntd-common-1.0-SNAPSHOT.jar b/psdc-business/lib/dntd-common-1.0-SNAPSHOT.jar new file mode 100644 index 0000000..a69ab52 Binary files /dev/null and b/psdc-business/lib/dntd-common-1.0-SNAPSHOT.jar differ diff --git a/psdc-business/lib/dntd-common-1.1-SNAPSHOT.jar b/psdc-business/lib/dntd-common-1.1-SNAPSHOT.jar deleted file mode 100644 index 2859372..0000000 Binary files a/psdc-business/lib/dntd-common-1.1-SNAPSHOT.jar and /dev/null differ diff --git a/psdc-business/lib/dntd-model-buildheating-1.0-SNAPSHOT.jar b/psdc-business/lib/dntd-model-buildheating-1.0-SNAPSHOT.jar new file mode 100644 index 0000000..487de2e Binary files /dev/null and b/psdc-business/lib/dntd-model-buildheating-1.0-SNAPSHOT.jar differ diff --git a/psdc-business/lib/dntd-model-buildheating-1.1-SNAPSHOT.jar b/psdc-business/lib/dntd-model-buildheating-1.1-SNAPSHOT.jar deleted file mode 100644 index c3ecf3b..0000000 Binary files a/psdc-business/lib/dntd-model-buildheating-1.1-SNAPSHOT.jar and /dev/null differ diff --git a/psdc-business/lib/dntd-model-heatboiler-1.0-SNAPSHOT.jar b/psdc-business/lib/dntd-model-heatboiler-1.0-SNAPSHOT.jar new file mode 100644 index 0000000..c4b3ab6 Binary files /dev/null and b/psdc-business/lib/dntd-model-heatboiler-1.0-SNAPSHOT.jar differ diff --git a/psdc-business/lib/dntd-model-heatboiler-1.1-SNAPSHOT.jar b/psdc-business/lib/dntd-model-heatboiler-1.1-SNAPSHOT.jar deleted file mode 100644 index 58c30a8..0000000 Binary files a/psdc-business/lib/dntd-model-heatboiler-1.1-SNAPSHOT.jar and /dev/null differ diff --git a/psdc-business/lib/dntd-model-kitchencooking-1.0-SNAPSHOT.jar b/psdc-business/lib/dntd-model-kitchencooking-1.0-SNAPSHOT.jar new file mode 100644 index 0000000..894d211 Binary files /dev/null and b/psdc-business/lib/dntd-model-kitchencooking-1.0-SNAPSHOT.jar differ diff --git a/psdc-business/lib/dntd-model-materialkiln-1.0-SNAPSHOT.jar b/psdc-business/lib/dntd-model-materialkiln-1.0-SNAPSHOT.jar new file mode 100644 index 0000000..0df1149 Binary files /dev/null and b/psdc-business/lib/dntd-model-materialkiln-1.0-SNAPSHOT.jar differ diff --git a/psdc-business/lib/dntd-model-metalkiln-1.0-SNAPSHOT.jar b/psdc-business/lib/dntd-model-metalkiln-1.0-SNAPSHOT.jar new file mode 100644 index 0000000..403517b Binary files /dev/null and b/psdc-business/lib/dntd-model-metalkiln-1.0-SNAPSHOT.jar differ diff --git a/psdc-business/lib/dntd-modelI-1.0-SNAPSHOT.jar b/psdc-business/lib/dntd-modelI-1.0-SNAPSHOT.jar new file mode 100644 index 0000000..76a54b0 Binary files /dev/null and b/psdc-business/lib/dntd-modelI-1.0-SNAPSHOT.jar differ diff --git a/psdc-business/lib/dntd-modelI-1.1-SNAPSHOT.jar b/psdc-business/lib/dntd-modelI-1.1-SNAPSHOT.jar deleted file mode 100644 index 9877d25..0000000 Binary files a/psdc-business/lib/dntd-modelI-1.1-SNAPSHOT.jar and /dev/null differ diff --git a/psdc-business/lib/dntd-tool-1.0-SNAPSHOT.jar b/psdc-business/lib/dntd-tool-1.0-SNAPSHOT.jar new file mode 100644 index 0000000..0af84f0 Binary files /dev/null and b/psdc-business/lib/dntd-tool-1.0-SNAPSHOT.jar differ diff --git a/psdc-business/lib/dntd-tool-1.2-SNAPSHOT.jar b/psdc-business/lib/dntd-tool-1.2-SNAPSHOT.jar deleted file mode 100644 index e69de29..0000000 diff --git a/psdc-business/src/main/java/com/psdc/entity/SysDeviceHeatScene.java b/psdc-business/src/main/java/com/psdc/entity/SysDeviceHeatScene.java index 24b7271..af12ccc 100644 --- a/psdc-business/src/main/java/com/psdc/entity/SysDeviceHeatScene.java +++ b/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 ; } diff --git a/psdc-business/src/main/java/com/psdc/enums/DeviceSubType.java b/psdc-business/src/main/java/com/psdc/enums/DeviceSubType.java new file mode 100644 index 0000000..dc3f0c4 --- /dev/null +++ b/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; + } + +} diff --git a/psdc-business/src/main/java/com/psdc/mapper/SysDeviceHeatSceneMapper.java b/psdc-business/src/main/java/com/psdc/mapper/SysDeviceHeatSceneMapper.java index b557b1e..63fca76 100644 --- a/psdc-business/src/main/java/com/psdc/mapper/SysDeviceHeatSceneMapper.java +++ b/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 selAllDevices(); + /** + * 根据设备类型查询设备 + * @param types 设备细类 + * @return + */ + List selDevicesBySubType(@Param(value = "types") String types); } diff --git a/psdc-business/src/main/java/com/psdc/service/impl/GenerateKeyIml.java b/psdc-business/src/main/java/com/psdc/service/impl/GenerateKeyIml.java index 686735e..afa39d1 100644 --- a/psdc-business/src/main/java/com/psdc/service/impl/GenerateKeyIml.java +++ b/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; diff --git a/psdc-business/src/main/java/com/psdc/service/model/IBuildHeatingService.java b/psdc-business/src/main/java/com/psdc/service/model/IBuildHeatingService.java index 3537230..e9e5125 100644 --- a/psdc-business/src/main/java/com/psdc/service/model/IBuildHeatingService.java +++ b/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 selDevicesBySubType(String types); + } diff --git a/psdc-business/src/main/java/com/psdc/service/model/impl/BuildHeatingServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/model/impl/BuildHeatingServiceImpl.java index f1705d2..bd9e656 100644 --- a/psdc-business/src/main/java/com/psdc/service/model/impl/BuildHeatingServiceImpl.java +++ b/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 selDevicesBySubType(String types) { + return deviceHeatSceneMapper.selDevicesBySubType(types); + } + } diff --git a/psdc-business/src/main/resources/mapper/business/SysDeviceHeatSceneMapper.xml b/psdc-business/src/main/resources/mapper/business/SysDeviceHeatSceneMapper.xml index 82ddcd8..4ba1a74 100644 --- a/psdc-business/src/main/resources/mapper/business/SysDeviceHeatSceneMapper.xml +++ b/psdc-business/src/main/resources/mapper/business/SysDeviceHeatSceneMapper.xml @@ -7,12 +7,18 @@ + + + + + + @@ -21,4 +27,8 @@ + + \ No newline at end of file diff --git a/psdc-web/src/main/java/com/psdc/controller/model/BuildHeatingController.java b/psdc-web/src/main/java/com/psdc/controller/model/BuildHeatingController.java index 6363780..ceb735d 100644 --- a/psdc-web/src/main/java/com/psdc/controller/model/BuildHeatingController.java +++ b/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; + } + } + }