diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 4ad83f1..001c160 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -16,7 +16,7 @@ * @date 2022-7-8 */ @RestController -@RequestMapping("/device/sim") +@RequestMapping("/device/simManage") public class DeviceImeiController { @@ -30,7 +30,7 @@ /** * 获取分页列表SMI */ - @RequestMapping(value = "/listpage") + @RequestMapping(value = "/listPage") @ResponseBody public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 4ad83f1..001c160 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -16,7 +16,7 @@ * @date 2022-7-8 */ @RestController -@RequestMapping("/device/sim") +@RequestMapping("/device/simManage") public class DeviceImeiController { @@ -30,7 +30,7 @@ /** * 获取分页列表SMI */ - @RequestMapping(value = "/listpage") + @RequestMapping(value = "/listPage") @ResponseBody public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index bb9abb6..848ec75 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -54,10 +54,10 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String modelName, String communication) { + public Object listPage(String deviceType, String communication) { Page page = PageFactory.defaultPage(); QueryWrapper query = new QueryWrapper() - .like("MODEL_NAME", modelName == null ? "" : modelName) + .like("MODEL_NAME", deviceType == null ? "" : deviceType) .like("COMMUNICATION", communication == null ? "" : communication); page = deviceModelsService.page(page, query); Map dictMap = deviceModelsService.getDictNameByCode(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 4ad83f1..001c160 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -16,7 +16,7 @@ * @date 2022-7-8 */ @RestController -@RequestMapping("/device/sim") +@RequestMapping("/device/simManage") public class DeviceImeiController { @@ -30,7 +30,7 @@ /** * 获取分页列表SMI */ - @RequestMapping(value = "/listpage") + @RequestMapping(value = "/listPage") @ResponseBody public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index bb9abb6..848ec75 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -54,10 +54,10 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String modelName, String communication) { + public Object listPage(String deviceType, String communication) { Page page = PageFactory.defaultPage(); QueryWrapper query = new QueryWrapper() - .like("MODEL_NAME", modelName == null ? "" : modelName) + .like("MODEL_NAME", deviceType == null ? "" : deviceType) .like("COMMUNICATION", communication == null ? "" : communication); page = deviceModelsService.page(page, query); Map dictMap = deviceModelsService.getDictNameByCode(); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java index 77cf504..673594d 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java @@ -31,38 +31,48 @@ /** * 设备类型名称 */ + @TableField("TYPE_NAME") private String typeName; /** * 类型描述 */ + @TableField("TYPE_DESCRIPTION") private String typeDescription; /** * 是否有效 */ + @TableField("VALID") + private String valid; /** * 监控内容 */ + @TableField("WATCH_TYPE") private String watchType; /** * 是否不需要绑定集中器 */ + @TableField("IS_NO_CONCENT") private String isNoConcent; /** * 报警规则类型 1需要单独设置报警规则，2统一的报警规则 3无报警规则 */ + @TableField("ALARM_RULE_TYPE") private String alarmRuleType; /** * 是否需要报警上限 */ + @TableField("ALARM_RULE_HIGHVALUE") private String alarmRuleHighvalue; /** * 是否需要报警下限 */ + @TableField("ALARM_RULE_LOWVALUE") private String alarmRuleLowvalue; /** * 数据展示配置，json串 */ + @TableField("DATA_CONFIG") private String dataConfig; @Override