diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/AlarmConfigMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/AlarmConfigMapper.java deleted file mode 100644 index ee7b5c9..0000000 --- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/AlarmConfigMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.AlarmConfig; - -/** - *

- * 报警配置 用于报警数据的生成 Mapper 接口 - *

- * - * @author cz - * @since 2023-11-20 - */ -public interface AlarmConfigMapper extends BaseMapper { - -} diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/AlarmConfigMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/AlarmConfigMapper.java deleted file mode 100644 index ee7b5c9..0000000 --- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/AlarmConfigMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.AlarmConfig; - -/** - *

- * 报警配置 用于报警数据的生成 Mapper 接口 - *

- * - * @author cz - * @since 2023-11-20 - */ -public interface AlarmConfigMapper extends BaseMapper { - -} diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml deleted file mode 100644 index bd2c2cc..0000000 --- a/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time - - - diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/AlarmConfigMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/AlarmConfigMapper.java deleted file mode 100644 index ee7b5c9..0000000 --- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/AlarmConfigMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.AlarmConfig; - -/** - *

- * 报警配置 用于报警数据的生成 Mapper 接口 - *

- * - * @author cz - * @since 2023-11-20 - */ -public interface AlarmConfigMapper extends BaseMapper { - -} diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml deleted file mode 100644 index bd2c2cc..0000000 --- a/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time - - - diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml index ea44fb5..3bc7e42 100644 --- a/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml +++ b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml @@ -48,7 +48,7 @@ dg.group_name AS "groupName" FROM ( SELECT * - FROM device_data + FROM alarm_data WHERE 1=1 AND devcode like CONCAT('%',#{request.devcode},'%') diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/AlarmConfigMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/AlarmConfigMapper.java deleted file mode 100644 index ee7b5c9..0000000 --- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/AlarmConfigMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.AlarmConfig; - -/** - *

- * 报警配置 用于报警数据的生成 Mapper 接口 - *

- * - * @author cz - * @since 2023-11-20 - */ -public interface AlarmConfigMapper extends BaseMapper { - -} diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml deleted file mode 100644 index bd2c2cc..0000000 --- a/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time - - - diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml index ea44fb5..3bc7e42 100644 --- a/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml +++ b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml @@ -48,7 +48,7 @@ dg.group_name AS "groupName" FROM ( SELECT * - FROM device_data + FROM alarm_data WHERE 1=1 AND devcode like CONCAT('%',#{request.devcode},'%') diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml index a2edc7f..f1442aa 100644 --- a/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml +++ b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml @@ -32,28 +32,35 @@ SELECT dv.id, - dv.product_id AS "taskName", - dv.product_name AS "productName", - dv.version_name AS "versionName", + dv.task_name AS "taskName", + d.product_name AS "productName", + dv.upgrade_version_name AS "upgradeVersionName", deptid, dv.create_time AS "createTime", dv.create_user_id AS "createUserId", dv.version, - dv.dscn AS "versionDscn", - dv.status, - dv.owner + dv.version_descn AS "versionDscn", + dv.status FROM ( SELECT * - FROM device_version + FROM device_upgrade_task WHERE 1=1 + + AND task_name =#{request.taskName} + + + AND upgrade_version_name =#{request.upgradeVersionName} + - AND dv.product_id =#{request.productId} + AND product_id =#{request.productId} + + + AND status =#{request.status} )dv JOIN ( - SELECT id + SELECT id,group_id,produce_name FROM product_info - WHERE valid=1 )d ON d.id=dv.product_id JOIN ( SELECT deptid,id,group_name diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml index 661f2d5..eb2d8e7 100644 --- a/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml +++ b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml @@ -51,9 +51,8 @@ )dv JOIN ( - SELECT id + SELECT id,group_id FROM product_info - WHERE valid=1 )d ON d.id=dv.product_id JOIN ( SELECT deptid,id,group_name diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/AlarmConfigMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/AlarmConfigMapper.java deleted file mode 100644 index ee7b5c9..0000000 --- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/AlarmConfigMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.AlarmConfig; - -/** - *

- * 报警配置 用于报警数据的生成 Mapper 接口 - *

- * - * @author cz - * @since 2023-11-20 - */ -public interface AlarmConfigMapper extends BaseMapper { - -} diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml deleted file mode 100644 index bd2c2cc..0000000 --- a/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time - - - diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml index ea44fb5..3bc7e42 100644 --- a/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml +++ b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml @@ -48,7 +48,7 @@ dg.group_name AS "groupName" FROM ( SELECT * - FROM device_data + FROM alarm_data WHERE 1=1 AND devcode like CONCAT('%',#{request.devcode},'%') diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml index a2edc7f..f1442aa 100644 --- a/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml +++ b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml @@ -32,28 +32,35 @@ SELECT dv.id, - dv.product_id AS "taskName", - dv.product_name AS "productName", - dv.version_name AS "versionName", + dv.task_name AS "taskName", + d.product_name AS "productName", + dv.upgrade_version_name AS "upgradeVersionName", deptid, dv.create_time AS "createTime", dv.create_user_id AS "createUserId", dv.version, - dv.dscn AS "versionDscn", - dv.status, - dv.owner + dv.version_descn AS "versionDscn", + dv.status FROM ( SELECT * - FROM device_version + FROM device_upgrade_task WHERE 1=1 + + AND task_name =#{request.taskName} + + + AND upgrade_version_name =#{request.upgradeVersionName} + - AND dv.product_id =#{request.productId} + AND product_id =#{request.productId} + + + AND status =#{request.status} )dv JOIN ( - SELECT id + SELECT id,group_id,produce_name FROM product_info - WHERE valid=1 )d ON d.id=dv.product_id JOIN ( SELECT deptid,id,group_name diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml index 661f2d5..eb2d8e7 100644 --- a/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml +++ b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml @@ -51,9 +51,8 @@ )dv JOIN ( - SELECT id + SELECT id,group_id FROM product_info - WHERE valid=1 )d ON d.id=dv.product_id JOIN ( SELECT deptid,id,group_name diff --git a/casic-iot-model/src/main/java/com/casic/missiles/dto/upgrade/UpgradeTaskListVO.java b/casic-iot-model/src/main/java/com/casic/missiles/dto/upgrade/UpgradeTaskListVO.java index 4125dcb..ab3841b 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/dto/upgrade/UpgradeTaskListVO.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/dto/upgrade/UpgradeTaskListVO.java @@ -17,16 +17,16 @@ private String productName; @ApiModelProperty(value = "升级包名称", dataType = "String") - private String versionName; + private String upgradeVersionName; @ApiModelProperty(value = "升级包版本号", dataType = "String") private String version; - @ApiModelProperty(value = "升级包版本号", dataType = "String") + @ApiModelProperty(value = "升级包版本号描述", dataType = "String") private String versionDscn; - @ApiModelProperty(value = "升级包版本号", dataType = "String") - private String status; + @ApiModelProperty(value = "任务状态", dataType = "Integer") + private Integer status; @ApiModelProperty(value = "创建人id", dataType = "Long") private Long createUserId; diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IAlarmConfigService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IAlarmConfigService.java deleted file mode 100644 index d2c0714..0000000 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/IAlarmConfigService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.AlarmConfig; - -/** - *

- * 报警配置 用于报警数据的生成 服务类 - *

- * - * @author cz - * @since 2023-11-20 - */ -public interface IAlarmConfigService extends IService { - -} diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/AlarmConfigMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/AlarmConfigMapper.java deleted file mode 100644 index ee7b5c9..0000000 --- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/AlarmConfigMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.AlarmConfig; - -/** - *

- * 报警配置 用于报警数据的生成 Mapper 接口 - *

- * - * @author cz - * @since 2023-11-20 - */ -public interface AlarmConfigMapper extends BaseMapper { - -} diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml deleted file mode 100644 index bd2c2cc..0000000 --- a/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time - - - diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml index ea44fb5..3bc7e42 100644 --- a/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml +++ b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml @@ -48,7 +48,7 @@ dg.group_name AS "groupName" FROM ( SELECT * - FROM device_data + FROM alarm_data WHERE 1=1 AND devcode like CONCAT('%',#{request.devcode},'%') diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml index a2edc7f..f1442aa 100644 --- a/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml +++ b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml @@ -32,28 +32,35 @@ SELECT dv.id, - dv.product_id AS "taskName", - dv.product_name AS "productName", - dv.version_name AS "versionName", + dv.task_name AS "taskName", + d.product_name AS "productName", + dv.upgrade_version_name AS "upgradeVersionName", deptid, dv.create_time AS "createTime", dv.create_user_id AS "createUserId", dv.version, - dv.dscn AS "versionDscn", - dv.status, - dv.owner + dv.version_descn AS "versionDscn", + dv.status FROM ( SELECT * - FROM device_version + FROM device_upgrade_task WHERE 1=1 + + AND task_name =#{request.taskName} + + + AND upgrade_version_name =#{request.upgradeVersionName} + - AND dv.product_id =#{request.productId} + AND product_id =#{request.productId} + + + AND status =#{request.status} )dv JOIN ( - SELECT id + SELECT id,group_id,produce_name FROM product_info - WHERE valid=1 )d ON d.id=dv.product_id JOIN ( SELECT deptid,id,group_name diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml index 661f2d5..eb2d8e7 100644 --- a/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml +++ b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml @@ -51,9 +51,8 @@ )dv JOIN ( - SELECT id + SELECT id,group_id FROM product_info - WHERE valid=1 )d ON d.id=dv.product_id JOIN ( SELECT deptid,id,group_name diff --git a/casic-iot-model/src/main/java/com/casic/missiles/dto/upgrade/UpgradeTaskListVO.java b/casic-iot-model/src/main/java/com/casic/missiles/dto/upgrade/UpgradeTaskListVO.java index 4125dcb..ab3841b 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/dto/upgrade/UpgradeTaskListVO.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/dto/upgrade/UpgradeTaskListVO.java @@ -17,16 +17,16 @@ private String productName; @ApiModelProperty(value = "升级包名称", dataType = "String") - private String versionName; + private String upgradeVersionName; @ApiModelProperty(value = "升级包版本号", dataType = "String") private String version; - @ApiModelProperty(value = "升级包版本号", dataType = "String") + @ApiModelProperty(value = "升级包版本号描述", dataType = "String") private String versionDscn; - @ApiModelProperty(value = "升级包版本号", dataType = "String") - private String status; + @ApiModelProperty(value = "任务状态", dataType = "Integer") + private Integer status; @ApiModelProperty(value = "创建人id", dataType = "Long") private Long createUserId; diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IAlarmConfigService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IAlarmConfigService.java deleted file mode 100644 index d2c0714..0000000 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/IAlarmConfigService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.AlarmConfig; - -/** - *

- * 报警配置 用于报警数据的生成 服务类 - *

- * - * @author cz - * @since 2023-11-20 - */ -public interface IAlarmConfigService extends IService { - -} diff --git a/casic-iot-web/src/main/java/com/casic/missiles/controller/AlarmConfigController.java b/casic-iot-web/src/main/java/com/casic/missiles/controller/AlarmConfigController.java deleted file mode 100644 index 12ca7de..0000000 --- a/casic-iot-web/src/main/java/com/casic/missiles/controller/AlarmConfigController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.casic.missiles.controller; - -import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 报警配置 用于报警数据的生成 前端控制器 - *

- * - * @author cz - * @since 2023-11-20 - */ -@RestController -@Api(tags = "报警配置管理模块") -@RequestMapping("/alarm/config") -public class AlarmConfigController { - - -} diff --git a/casic-iot-web/src/main/java/com/casic/missiles/controller/AlarmDataController.java b/casic-iot-web/src/main/java/com/casic/missiles/controller/AlarmDataController.java index bf09f0f..5cedd93 100644 --- a/casic-iot-web/src/main/java/com/casic/missiles/controller/AlarmDataController.java +++ b/casic-iot-web/src/main/java/com/casic/missiles/controller/AlarmDataController.java @@ -11,11 +11,8 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.alarm.AlarmDataDTO; import com.casic.missiles.dto.alarm.AlarmDataListVO; -import com.casic.missiles.dto.data.DeviceDataListRequest; -import com.casic.missiles.dto.data.DeviceDataListVO; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.AlarmData; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IAlarmDataService; import io.swagger.annotations.Api; @@ -80,5 +77,4 @@ super.exportExcel(AlarmDataListVO.class, list, ExportEnum.DEVICE_DATA_EXPORT.getSheetName()); } - } diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/AlarmConfigMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/AlarmConfigMapper.java deleted file mode 100644 index ee7b5c9..0000000 --- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/AlarmConfigMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.AlarmConfig; - -/** - *

- * 报警配置 用于报警数据的生成 Mapper 接口 - *

- * - * @author cz - * @since 2023-11-20 - */ -public interface AlarmConfigMapper extends BaseMapper { - -} diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml deleted file mode 100644 index bd2c2cc..0000000 --- a/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time - - - diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml index ea44fb5..3bc7e42 100644 --- a/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml +++ b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml @@ -48,7 +48,7 @@ dg.group_name AS "groupName" FROM ( SELECT * - FROM device_data + FROM alarm_data WHERE 1=1 AND devcode like CONCAT('%',#{request.devcode},'%') diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml index a2edc7f..f1442aa 100644 --- a/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml +++ b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml @@ -32,28 +32,35 @@ SELECT dv.id, - dv.product_id AS "taskName", - dv.product_name AS "productName", - dv.version_name AS "versionName", + dv.task_name AS "taskName", + d.product_name AS "productName", + dv.upgrade_version_name AS "upgradeVersionName", deptid, dv.create_time AS "createTime", dv.create_user_id AS "createUserId", dv.version, - dv.dscn AS "versionDscn", - dv.status, - dv.owner + dv.version_descn AS "versionDscn", + dv.status FROM ( SELECT * - FROM device_version + FROM device_upgrade_task WHERE 1=1 + + AND task_name =#{request.taskName} + + + AND upgrade_version_name =#{request.upgradeVersionName} + - AND dv.product_id =#{request.productId} + AND product_id =#{request.productId} + + + AND status =#{request.status} )dv JOIN ( - SELECT id + SELECT id,group_id,produce_name FROM product_info - WHERE valid=1 )d ON d.id=dv.product_id JOIN ( SELECT deptid,id,group_name diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml index 661f2d5..eb2d8e7 100644 --- a/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml +++ b/casic-iot-dao/src/main/resources/mapper/DeviceVersionMapper.xml @@ -51,9 +51,8 @@ )dv JOIN ( - SELECT id + SELECT id,group_id FROM product_info - WHERE valid=1 )d ON d.id=dv.product_id JOIN ( SELECT deptid,id,group_name diff --git a/casic-iot-model/src/main/java/com/casic/missiles/dto/upgrade/UpgradeTaskListVO.java b/casic-iot-model/src/main/java/com/casic/missiles/dto/upgrade/UpgradeTaskListVO.java index 4125dcb..ab3841b 100644 --- a/casic-iot-model/src/main/java/com/casic/missiles/dto/upgrade/UpgradeTaskListVO.java +++ b/casic-iot-model/src/main/java/com/casic/missiles/dto/upgrade/UpgradeTaskListVO.java @@ -17,16 +17,16 @@ private String productName; @ApiModelProperty(value = "升级包名称", dataType = "String") - private String versionName; + private String upgradeVersionName; @ApiModelProperty(value = "升级包版本号", dataType = "String") private String version; - @ApiModelProperty(value = "升级包版本号", dataType = "String") + @ApiModelProperty(value = "升级包版本号描述", dataType = "String") private String versionDscn; - @ApiModelProperty(value = "升级包版本号", dataType = "String") - private String status; + @ApiModelProperty(value = "任务状态", dataType = "Integer") + private Integer status; @ApiModelProperty(value = "创建人id", dataType = "Long") private Long createUserId; diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IAlarmConfigService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IAlarmConfigService.java deleted file mode 100644 index d2c0714..0000000 --- a/casic-iot-service/src/main/java/com/casic/missiles/service/IAlarmConfigService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.model.AlarmConfig; - -/** - *

- * 报警配置 用于报警数据的生成 服务类 - *

- * - * @author cz - * @since 2023-11-20 - */ -public interface IAlarmConfigService extends IService { - -} diff --git a/casic-iot-web/src/main/java/com/casic/missiles/controller/AlarmConfigController.java b/casic-iot-web/src/main/java/com/casic/missiles/controller/AlarmConfigController.java deleted file mode 100644 index 12ca7de..0000000 --- a/casic-iot-web/src/main/java/com/casic/missiles/controller/AlarmConfigController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.casic.missiles.controller; - -import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 报警配置 用于报警数据的生成 前端控制器 - *

- * - * @author cz - * @since 2023-11-20 - */ -@RestController -@Api(tags = "报警配置管理模块") -@RequestMapping("/alarm/config") -public class AlarmConfigController { - - -} diff --git a/casic-iot-web/src/main/java/com/casic/missiles/controller/AlarmDataController.java b/casic-iot-web/src/main/java/com/casic/missiles/controller/AlarmDataController.java index bf09f0f..5cedd93 100644 --- a/casic-iot-web/src/main/java/com/casic/missiles/controller/AlarmDataController.java +++ b/casic-iot-web/src/main/java/com/casic/missiles/controller/AlarmDataController.java @@ -11,11 +11,8 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.alarm.AlarmDataDTO; import com.casic.missiles.dto.alarm.AlarmDataListVO; -import com.casic.missiles.dto.data.DeviceDataListRequest; -import com.casic.missiles.dto.data.DeviceDataListVO; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.AlarmData; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IAlarmDataService; import io.swagger.annotations.Api; @@ -80,5 +77,4 @@ super.exportExcel(AlarmDataListVO.class, list, ExportEnum.DEVICE_DATA_EXPORT.getSheetName()); } - } diff --git a/casic-iot-web/src/main/java/com/casic/missiles/controller/DeviceUpgradeTaskController.java b/casic-iot-web/src/main/java/com/casic/missiles/controller/DeviceUpgradeTaskController.java index 986fcdc..01afa6c 100644 --- a/casic-iot-web/src/main/java/com/casic/missiles/controller/DeviceUpgradeTaskController.java +++ b/casic-iot-web/src/main/java/com/casic/missiles/controller/DeviceUpgradeTaskController.java @@ -9,12 +9,10 @@ import com.casic.missiles.dto.IdsDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.alarm.AlarmDataListVO; import com.casic.missiles.dto.upgrade.UpgradeTaskDTO; import com.casic.missiles.dto.upgrade.UpgradeTaskListVO; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.DeviceUpgradeTask; -import com.casic.missiles.model.DeviceVersion; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IDeviceUpgradeTaskService; import io.swagger.annotations.Api; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/controller/ReceiveController.java b/sensorhub-core/src/main/java/com/casic/missiles/controller/ReceiveController.java index 8e72368..77b379f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/controller/ReceiveController.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/controller/ReceiveController.java @@ -2,6 +2,7 @@ import com.alibaba.fastjson.JSON; import com.casic.missiles.dto.ResponseData; +import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -13,6 +14,7 @@ @RestController @RequestMapping("/push") +@Slf4j public class ReceiveController { private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(5, 10, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10)); @@ -34,7 +36,7 @@ @RequestMapping("/test") public Object testNbCallBack(@RequestBody Map dataMap) { ResponseData responseData = new ResponseData(); - System.out.println("----------" + JSON.toJSON(dataMap)); + log.info("----------" + JSON.toJSON(dataMap)); responseData.setCode(200); return responseData; } diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/AlarmConfigMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/AlarmConfigMapper.java deleted file mode 100644 index ee7b5c9..0000000 --- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/AlarmConfigMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.missiles.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.model.AlarmConfig; - -/** - *

- * 报警配置 用于报警数据的生成 Mapper 接口 - *

- * - * @author cz - * @since 2023-11-20 - */ -public interface AlarmConfigMapper extends BaseMapper { - -} diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml deleted file mode 100644 index bd2c2cc..0000000 --- a/casic-iot-dao/src/main/resources/mapper/AlarmConfigMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - id, name, product_id, alarm_content, period_high, period_low, TypeName, CreatorId, creater_user_id, create_time - - - diff --git a/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml index ea44fb5..3bc7e42 100644 --- a/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml +++ b/casic-iot-dao/src/main/resources/mapper/AlarmDataMapper.xml @@ -48,7 +48,7 @@ dg.group_name AS "groupName" FROM ( SELECT * - FROM device_data + FROM alarm_data WHERE 1=1 AND devcode like CONCAT('%',#{request.devcode},'%') diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml index a2edc7f..f1442aa 100644 --- a/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml +++ b/casic-iot-dao/src/main/resources/mapper/DeviceUpgradeTaskMapper.xml @@ -32,28 +32,35 @@