Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

模板增加一次值、二次值标识

Browse Source
This commit is contained in:
xy
2024-08-09 08:39:56 +08:00
parent 48ee232a0b
commit 4b37b40e84
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDataSet.java
View File

@@ -75,4 +75,9 @@ public class CsDataSet extends BaseEntity {
*/
private String dataList;
/**
* 数据类型 一次值||二次值
*/
private String dataLevel;
}

3
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsGroupController.java
View File

@@ -13,9 +13,7 @@ import com.njcn.csdevice.pojo.vo.DataGroupTemplateVO;
import com.njcn.csdevice.service.ICsGroupService;
import com.njcn.csharmonic.param.CommonStatisticalQueryParam;
import com.njcn.csharmonic.pojo.vo.ThdDataTdVO;
import com.njcn.csharmonic.pojo.vo.ThdDataVO;
import com.njcn.system.pojo.po.EleEpdPqd;
import com.njcn.system.pojo.vo.EleEpdPqdListVO;
import com.njcn.web.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -26,7 +24,6 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
/**
* <p>

2
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
View File

@@ -113,7 +113,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
if (Objects.equals(DicDataEnum.PORTABLE.getCode(),code)) {
csEquipmentDeliveryPo.setProcess(4);
} else if (Objects.equals(DicDataEnum.CONNECT_DEV.getCode(),code)) {
csEquipmentDeliveryPo.setProcess(2);
csEquipmentDeliveryPo.setProcess(1);
}
//生成二维码文件
String qr = this.createQr(csEquipmentDeliveryAddParm.getNdid());