whycxzp
2025-03-14 2362b75e54c3425c3172aa04f4fe12484f3af709
A200设备相关代码命名规范化
4 文件已重命名
7个文件已修改
46 ■■■■ 已修改文件
src/main/java/com/whyc/mapper/DevA200TestparamMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/DevActmTestparamMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/WorkstateCfgMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/WorkstateChangeeventMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/db_lithium_ram_db/DevA200TestParam.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/db_lithium_ram_db/DevActmTestParam.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/db_lithium_ram_db/WorkStateCfg.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/db_lithium_ram_db/WorkStateChangeEvent.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/DevA200TestparamService.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/DevActmTestparamService.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/WorkstateChangeeventService.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/DevA200TestparamMapper.java
@@ -1,6 +1,6 @@
package com.whyc.mapper;
import com.whyc.pojo.db_lithium_ram_db.DevA200Testparam;
import com.whyc.pojo.db_lithium_ram_db.DevA200TestParam;
public interface DevA200TestparamMapper extends CustomMapper<DevA200Testparam>{
public interface DevA200TestparamMapper extends CustomMapper<DevA200TestParam>{
}
src/main/java/com/whyc/mapper/DevActmTestparamMapper.java
@@ -1,6 +1,6 @@
package com.whyc.mapper;
import com.whyc.pojo.db_lithium_ram_db.DevActmTestparam;
import com.whyc.pojo.db_lithium_ram_db.DevActmTestParam;
public interface DevActmTestparamMapper extends CustomMapper<DevActmTestparam>{
public interface DevActmTestparamMapper extends CustomMapper<DevActmTestParam>{
}
src/main/java/com/whyc/mapper/WorkstateCfgMapper.java
@@ -1,6 +1,6 @@
package com.whyc.mapper;
import com.whyc.pojo.db_lithium_ram_db.WorkstateCfg;
import com.whyc.pojo.db_lithium_ram_db.WorkStateCfg;
public interface WorkstateCfgMapper extends CustomMapper<WorkstateCfg>{
public interface WorkstateCfgMapper extends CustomMapper<WorkStateCfg>{
}
src/main/java/com/whyc/mapper/WorkstateChangeeventMapper.java
@@ -1,6 +1,6 @@
package com.whyc.mapper;
import com.whyc.pojo.db_lithium_ram_db.WorkstateChangeevent;
import com.whyc.pojo.db_lithium_ram_db.WorkStateChangeEvent;
public interface WorkstateChangeeventMapper extends CustomMapper<WorkstateChangeevent>{
public interface WorkstateChangeeventMapper extends CustomMapper<WorkStateChangeEvent>{
}
src/main/java/com/whyc/pojo/db_lithium_ram_db/DevA200TestParam.java
File was renamed from src/main/java/com/whyc/pojo/db_lithium_ram_db/DevA200Testparam.java
@@ -24,7 +24,7 @@
@Accessors(chain = true)
@TableName(schema = "db_lithium_ram_db",value ="tb_dev_a200_testparam")
@ApiModel(value="DevA200Testparam对象", description="A200测试参数表")
public class DevA200Testparam implements Serializable {
public class DevA200TestParam implements Serializable {
    private static final long serialVersionUID = 1L;
src/main/java/com/whyc/pojo/db_lithium_ram_db/DevActmTestParam.java
File was renamed from src/main/java/com/whyc/pojo/db_lithium_ram_db/DevActmTestparam.java
@@ -24,7 +24,7 @@
@Accessors(chain = true)
@TableName(schema = "db_lithium_ram_db",value ="tb_dev_actm_testparam")
@ApiModel(value="DevActmTestparam对象", description="actm 测试参数表")
public class DevActmTestparam implements Serializable {
public class DevActmTestParam implements Serializable {
    private static final long serialVersionUID = 1L;
src/main/java/com/whyc/pojo/db_lithium_ram_db/WorkStateCfg.java
File was renamed from src/main/java/com/whyc/pojo/db_lithium_ram_db/WorkstateCfg.java
@@ -24,7 +24,7 @@
@Accessors(chain = true)
@TableName(schema = "db_lithium_ram_db",value ="tb_workstate_cfg")
@ApiModel(value="WorkstateCfg对象", description="设备工作切换描述配置表")
public class WorkstateCfg implements Serializable {
public class WorkStateCfg implements Serializable {
    private static final long serialVersionUID = 1L;
src/main/java/com/whyc/pojo/db_lithium_ram_db/WorkStateChangeEvent.java
File was renamed from src/main/java/com/whyc/pojo/db_lithium_ram_db/WorkstateChangeevent.java
@@ -27,7 +27,7 @@
@Accessors(chain = true)
@TableName(schema = "db_lithium_ram_db",value ="tb_workstate_changeevent")
@ApiModel(value="WorkstateChangeevent对象", description="设备工作状态切换事件表")
public class WorkstateChangeevent implements Serializable {
public class WorkStateChangeEvent implements Serializable {
    private static final long serialVersionUID = 1L;
src/main/java/com/whyc/service/DevA200TestparamService.java
@@ -8,7 +8,7 @@
import com.whyc.factory.ThreadPoolExecutorFactory;
import com.whyc.mapper.DevA200TestparamMapper;
import com.whyc.mapper.DevInfMapper;
import com.whyc.pojo.db_lithium_ram_db.DevA200Testparam;
import com.whyc.pojo.db_lithium_ram_db.DevA200TestParam;
import com.whyc.pojo.db_lithium_ram_db.DevInf;
import com.whyc.util.ActionUtil;
import com.whyc.util.JsonUtil;
@@ -68,7 +68,7 @@
        String url="http://"+dinf.getDevIp()+":8080/webService/getTestParameter";
        ResultA200Dto dto= getA200Dto(url);
        if(dto.getCode().equals("200")){
            DevA200Testparam a200Param=new DevA200Testparam();
            DevA200TestParam a200Param=new DevA200TestParam();
            copyA200DTO(dto.getData(),a200Param);
            a200Param.setDevId(devId);
            a200Param.setReturnCode(Integer.parseInt(dto.getCode()));
@@ -247,7 +247,7 @@
    }
    //将dto拷贝至param
    private void copyA200DTO(Object data, DevA200Testparam a200Param) {
    private void copyA200DTO(Object data, DevA200TestParam a200Param) {
        A200ResDto dto= (A200ResDto) data;
        a200Param.setBatteryName(dto.getBatteryName());
        a200Param.setNominalCapacity(dto.getNominalCapacity());
src/main/java/com/whyc/service/DevActmTestparamService.java
@@ -9,7 +9,7 @@
import com.whyc.factory.ThreadPoolExecutorFactory;
import com.whyc.mapper.DevActmTestparamMapper;
import com.whyc.mapper.DevInfMapper;
import com.whyc.pojo.db_lithium_ram_db.DevActmTestparam;
import com.whyc.pojo.db_lithium_ram_db.DevActmTestParam;
import com.whyc.pojo.db_lithium_ram_db.DevInf;
import com.whyc.util.TestparamHttpUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -53,7 +53,7 @@
        paramMap.add("batteryStorageIndex",index);
        ResultActmDto dto= (ResultActmDto) TestparamHttpUtil.postforform_dataActm(restTemplate,url,paramMap);
        if(dto.getCode().equals("200")){
            DevActmTestparam actmParam=new DevActmTestparam();
            DevActmTestParam actmParam=new DevActmTestParam();
            copyActmDTO(dto.getData(),actmParam);
            actmParam.setDevId(devId);
            UpdateWrapper updateWrapper=new UpdateWrapper();
@@ -179,7 +179,7 @@
    }
    //将dto拷贝至param
    private void copyActmDTO(Object data, DevActmTestparam actmParam) {
    private void copyActmDTO(Object data, DevActmTestParam actmParam) {
        ActmResDto dto= (ActmResDto) data;
        actmParam.setBatteryStorageIndex(dto.getBatteryStorageIndex());
        actmParam.setModuleCode(dto.getModuleCode());
src/main/java/com/whyc/service/WorkstateChangeeventService.java
@@ -4,8 +4,8 @@
import com.whyc.dto.Response;
import com.whyc.mapper.WorkstateCfgMapper;
import com.whyc.mapper.WorkstateChangeeventMapper;
import com.whyc.pojo.db_lithium_ram_db.WorkstateCfg;
import com.whyc.pojo.db_lithium_ram_db.WorkstateChangeevent;
import com.whyc.pojo.db_lithium_ram_db.WorkStateCfg;
import com.whyc.pojo.db_lithium_ram_db.WorkStateChangeEvent;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -27,14 +27,14 @@
        wrapper.orderByDesc("record_time");
        wrapper.last("limit 100");
        int devType=devId/100000000;
        List<WorkstateChangeevent> list=mapper.selectList(wrapper);
        for (WorkstateChangeevent event:list) {
        List<WorkStateChangeEvent> list=mapper.selectList(wrapper);
        for (WorkStateChangeEvent event:list) {
            QueryWrapper wrapper1=new QueryWrapper();
            wrapper1.eq("dev_type",devType);
            wrapper1.eq("last_work_state",event.getLastWorkState());
            wrapper1.eq("now_work_state",event.getNowWorkState());
            wrapper1.last("limit 1");
            WorkstateCfg cfg=cfgMapper.selectOne(wrapper1);
            WorkStateCfg cfg=cfgMapper.selectOne(wrapper1);
            if(cfg==null){
                event.setEventStr("---");
            }else{