src/main/java/com/fzzy/async/whhpjl/Fzzy40ToWhjlSyncService11.java
@@ -52,17 +52,17 @@ fz40ToWhjlSync1101.syncData(kqdm, deptId, start, end); //TODO 同步军工站点信息 //同步军工站点信息 fz40ToWhjlSync1102.syncData(kqdm, deptId, start, end); //TODO 同步军粮人员信息 //同步军粮人员信息 fz40ToWhjlSync1103.syncData(kqdm, deptId, start, end); //TODO 同步仓房信息 //同步仓房信息 fz40ToWhjlSync1105.syncData(kqdm, deptId, start, end); //TODO 同步廒间信息 // 同步廒间信息 fz40ToWhjlSync1106.syncData(kqdm, deptId, start, end); //TODO 同步货位信息 // 同步货位信息 fz40ToWhjlSync1107.syncData(kqdm, deptId, start, end); //TODO 同步仓储设备信息 // 同步仓储设备信息 fz40ToWhjlSync1111.syncData(kqdm, deptId, start, end); }
@@ -1,7 +1,6 @@ package com.fzzy.async.whhpjl.entity; import com.bstek.dorado.annotation.PropertyDef; import com.fzzy.async.fzzy35.entity.Fz35PestKey; import lombok.Data; import javax.persistence.*; src/main/java/com/fzzy/push/whhpjl/WhjlPushService11.java
@@ -11,11 +11,12 @@ import com.fzzy.api.service.PushService11; import com.fzzy.api.view.repository.ApiInfoDataRep; import com.fzzy.whjl.WhjlConstant; import com.fzzy.whjl.dto.WhjlApi1101; import com.fzzy.whjl.dto.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -47,18 +48,18 @@ //推送军工企业信息 this.pushData1101(apiRemoteService, param); //TODO 推送军工站点信息 //TODO 推送军粮人员信息 //TODO 推送仓房信息 //TODO 推送廒间信息 //TODO 推送货位信息 //TODO 推送仓储设备信息 // 推送军工站点信息 this.pushData1102(apiRemoteService, param); // 推送军粮人员信息 this.pushData1103(apiRemoteService, param); // 推送仓房信息 this.pushData1105(apiRemoteService, param); // 推送廒间信息 this.pushData1106(apiRemoteService, param); // 推送货位信息 this.pushData1107(apiRemoteService, param); // 推送仓储设备信息 this.pushData1111(apiRemoteService, param); log.info("武汉军粮省平台--->>>基础信息 上报结束"); } @@ -92,7 +93,235 @@ if (responseDto.getSuccess() == 0) { //推送成功，更新数据上传状态 for (ApiInfoData data : items) { if(Constant.CZBZ_I.equals(data.getCzbz())){ if (Constant.CZBZ_I.equals(data.getCzbz())) { data.setCzbz(Constant.CZBZ_U); apiInfoDataRep.save(data); } } } } /** * 1102 军供站点信息 */ private void pushData1102(ApiRemoteService apiRemoteService, ApiParam param) { //获取军工企业信息 List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1102); if (null == items || items.isEmpty()) { return; } param.setInteCategory(WhjlConstant.API_CATEGORY_11); param.setInteId(WhjlConstant.API_CODE_1102); List<WhjlApi1102> list = new ArrayList<>(); WhjlApi1102 whjlApi1102; for (ApiInfoData infoData : items) { whjlApi1102 = JSONObject.parseObject(infoData.getData(), WhjlApi1102.class); whjlApi1102.setKqdm(infoData.getKqdm()); whjlApi1102.setCzbz(infoData.getCzbz()); whjlApi1102.setUpdateTime(infoData.getUpdateTime()); whjlApi1102.setBizId(infoData.getDataId()); list.add(whjlApi1102); } //推送，数据为集合形式 ResponseDto responseDto = apiRemoteService.pushData(param, list); if (responseDto.getSuccess() == 0) { //推送成功，更新数据上传状态 for (ApiInfoData data : items) { if (Constant.CZBZ_I.equals(data.getCzbz())) { data.setCzbz(Constant.CZBZ_U); apiInfoDataRep.save(data); } } } } /** * 1103 军工人员信息 */ private void pushData1103(ApiRemoteService apiRemoteService, ApiParam param) { //获取军工企业信息 List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1103); if (null == items || items.isEmpty()) { return; } param.setInteCategory(WhjlConstant.API_CATEGORY_11); param.setInteId(WhjlConstant.API_CODE_1103); List<WhjlApi1103> list = new ArrayList<>(); WhjlApi1103 whjlApi1103; for (ApiInfoData infoData : items) { whjlApi1103 = JSONObject.parseObject(infoData.getData(), WhjlApi1103.class); whjlApi1103.setKqdm(infoData.getKqdm()); whjlApi1103.setCzbz(infoData.getCzbz()); whjlApi1103.setUpdateTime(infoData.getUpdateTime()); whjlApi1103.setBizId(infoData.getDataId()); list.add(whjlApi1103); } //推送，数据为集合形式 ResponseDto responseDto = apiRemoteService.pushData(param, list); if (responseDto.getSuccess() == 0) { //推送成功，更新数据上传状态 for (ApiInfoData data : items) { if (Constant.CZBZ_I.equals(data.getCzbz())) { data.setCzbz(Constant.CZBZ_U); apiInfoDataRep.save(data); } } } } /** * 1105 仓房信息 */ private void pushData1105(ApiRemoteService apiRemoteService, ApiParam param) { //获取军工企业信息 List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1105); if (null == items || items.isEmpty()) { return; } param.setInteCategory(WhjlConstant.API_CATEGORY_11); param.setInteId(WhjlConstant.API_CODE_1105); List<WhjlApi1105> list = new ArrayList<>(); WhjlApi1105 whjlApi1105; for (ApiInfoData infoData : items) { whjlApi1105 = JSONObject.parseObject(infoData.getData(), WhjlApi1105.class); whjlApi1105.setKqdm(infoData.getKqdm()); whjlApi1105.setCzbz(infoData.getCzbz()); whjlApi1105.setUpdateTime(infoData.getUpdateTime()); whjlApi1105.setBizId(infoData.getDataId()); list.add(whjlApi1105); } //推送，数据为集合形式 ResponseDto responseDto = apiRemoteService.pushData(param, list); if (responseDto.getSuccess() == 0) { //推送成功，更新数据上传状态 for (ApiInfoData data : items) { if (Constant.CZBZ_I.equals(data.getCzbz())) { data.setCzbz(Constant.CZBZ_U); apiInfoDataRep.save(data); } } } } /** * 1106 廒间信息 */ private void pushData1106(ApiRemoteService apiRemoteService, ApiParam param) { //获取军工企业信息 List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1106); if (null == items || items.isEmpty()) { return; } param.setInteCategory(WhjlConstant.API_CATEGORY_11); param.setInteId(WhjlConstant.API_CODE_1106); List<WhjlApi1106> list = new ArrayList<>(); WhjlApi1106 whjlApi1106; for (ApiInfoData infoData : items) { whjlApi1106 = JSONObject.parseObject(infoData.getData(), WhjlApi1106.class); whjlApi1106.setKqdm(infoData.getKqdm()); whjlApi1106.setCzbz(infoData.getCzbz()); whjlApi1106.setUpdateTime(infoData.getUpdateTime()); whjlApi1106.setBizId(infoData.getDataId()); list.add(whjlApi1106); } //推送，数据为集合形式 ResponseDto responseDto = apiRemoteService.pushData(param, list); if (responseDto.getSuccess() == 0) { //推送成功，更新数据上传状态 for (ApiInfoData data : items) { if (Constant.CZBZ_I.equals(data.getCzbz())) { data.setCzbz(Constant.CZBZ_U); apiInfoDataRep.save(data); } } } } /** * 1107 货位信息 */ private void pushData1107(ApiRemoteService apiRemoteService, ApiParam param) { //获取军工企业信息 List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1107); if (null == items || items.isEmpty()) { return; } param.setInteCategory(WhjlConstant.API_CATEGORY_11); param.setInteId(WhjlConstant.API_CODE_1107); List<WhjlApi1107> list = new ArrayList<>(); WhjlApi1107 whjlApi1107; for (ApiInfoData infoData : items) { whjlApi1107 = JSONObject.parseObject(infoData.getData(), WhjlApi1107.class); whjlApi1107.setKqdm(infoData.getKqdm()); whjlApi1107.setCzbz(infoData.getCzbz()); whjlApi1107.setUpdateTime(infoData.getUpdateTime()); whjlApi1107.setBizId(infoData.getDataId()); list.add(whjlApi1107); } //推送，数据为集合形式 ResponseDto responseDto = apiRemoteService.pushData(param, list); if (responseDto.getSuccess() == 0) { //推送成功，更新数据上传状态 for (ApiInfoData data : items) { if (Constant.CZBZ_I.equals(data.getCzbz())) { data.setCzbz(Constant.CZBZ_U); apiInfoDataRep.save(data); } } } } /** * 1111 仓储设备信息 */ private void pushData1111(ApiRemoteService apiRemoteService, ApiParam param) { //获取军工企业信息 List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1111); if (null == items || items.isEmpty()) { return; } param.setInteCategory(WhjlConstant.API_CATEGORY_11); param.setInteId(WhjlConstant.API_CODE_1111); List<WhjlApi1111> list = new ArrayList<>(); WhjlApi1111 whjlApi1111; for (ApiInfoData infoData : items) { whjlApi1111 = JSONObject.parseObject(infoData.getData(), WhjlApi1111.class); whjlApi1111.setKqdm(infoData.getKqdm()); whjlApi1111.setCzbz(infoData.getCzbz()); whjlApi1111.setUpdateTime(infoData.getUpdateTime()); whjlApi1111.setBizId(infoData.getDataId()); list.add(whjlApi1111); } //推送，数据为集合形式 ResponseDto responseDto = apiRemoteService.pushData(param, list); if (responseDto.getSuccess() == 0) { //推送成功，更新数据上传状态 for (ApiInfoData data : items) { if (Constant.CZBZ_I.equals(data.getCzbz())) { data.setCzbz(Constant.CZBZ_U); apiInfoDataRep.save(data); src/main/java/com/fzzy/whjl/dto/WhjlApi1111.java
@@ -44,16 +44,16 @@ private String zynhyq; //主要保管要求 private Date xgrq; //修改日期 private String tbrmc; //填表人名称 private String Sfytkk; //是否云台可控 private String sfytkk; //是否云台可控 private String ipdz; //IP地址 private Integer Gldk; //管理端口 private Integer gldk; //管理端口 private String sdkdk; //Sdk端口 private String zh; //帐号 private String mm; //密码 private Integer rstpdz; //Rtsp地址 private String rtspdk; //rtsp端口 private String sbxlh; //设备序列号 private String Jklx; //监控类型 private String jklx; //监控类型 private String sfyx; //是否有效 private String bz; //备注
@@ -396,11 +396,6 @@ <PropertyDef name="sfjbjlcbzg"> <Property></Property> <Property name="label">是否具备军粮储备资格</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("YN")}</Property> <Property name="keyProperty">code</Property> <Property name="valueProperty">name</Property> </Property> </PropertyDef> <PropertyDef name="fddbr"> <Property></Property> @@ -488,11 +483,6 @@ <PropertyDef name="sfyx"> <Property></Property> <Property name="label">是否启用</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("YN")}</Property> <Property name="keyProperty">code</Property> <Property name="valueProperty">name</Property> </Property> </PropertyDef> <PropertyDef name="bz"> <Property></Property> @@ -759,6 +749,7 @@ <AutoFormElement> <Property name="name">sfjbjlcbzg</Property> <Property name="property">sfjbjlcbzg</Property> <Property name="trigger">listDropYN</Property> <Editor/> </AutoFormElement> <AutoFormElement> @@ -856,6 +847,7 @@ <AutoFormElement> <Property name="name">sfyx</Property> <Property name="property">sfyx</Property> <Property name="trigger">listDropYN</Property> <Editor/> </AutoFormElement> <AutoFormElement> @@ -902,7 +894,7 @@ <Property name="service">whjlApi1101PR#pushData</Property> </AjaxAction> <CustomDropDown id="cddGbArea"> <Property name="assignmentMap">xzqhdm=code,xzqhmc=name</Property> <Property name="assignmentMap">qyxzqhdm=code,qyxzqhmc=name</Property> <Property name="height">500</Property> <Property name="minHeight">500</Property> <Property name="maxHeight">500</Property> @@ -963,11 +955,19 @@ <Children> <Container> <IFrame id="iFrame"> <Property name="userData"></Property> <Property name="path">com.fzzy.api.view.ApiLog.d</Property> <Property name="userData"> <Entity> <Property name="deptId">deptId</Property> </Entity> </Property> </IFrame> </Container> </Children> <Tools/> </Dialog> <ListDropDown id="listDropYN"> <Property name="items">是,否</Property> </ListDropDown> </View> </ViewConfig> src/main/java/com/fzzy/whjl/view/WhjlApi1102.view.xml
@@ -185,14 +185,31 @@ <PropertyDef name="sfyx"> <Property></Property> <Property name="label">是否启用</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("YN")}</Property> <Property name="keyProperty">code</Property> </Property> </PropertyDef> <PropertyDef name="bz"> <Property></Property> <Property name="label">备注</Property> </PropertyDef> <PropertyDef name="bizId"> <Property></Property> <Property name="label">业务ID</Property> </PropertyDef> <PropertyDef name="updateTime"> <Property name="dataType">Date</Property> <Property name="label">更新时间</Property> </PropertyDef> <PropertyDef name="czbz"> <Property></Property> <Property name="label">操作标志</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("CZBZ")}</Property> <Property name="keyProperty">code</Property> <Property name="valueProperty">name</Property> </Property> </PropertyDef> <PropertyDef name="kqdm"> <Property></Property> <Property name="label">库区代码</Property> </PropertyDef> </DataType> <DataType name="dtGBArea"> @@ -502,9 +519,30 @@ <AutoFormElement> <Property name="name">sfyx</Property> <Property name="property">sfyx</Property> <Property name="trigger">listDropYN</Property> <Editor/> </AutoFormElement> <AutoFormElement layoutConstraint="colSpan:3"> <AutoFormElement> <Property name="name">bizId</Property> <Property name="property">bizId</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">updateTime</Property> <Property name="property">updateTime</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">czbz</Property> <Property name="property">czbz</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">kqdm</Property> <Property name="property">kqdm</Property> <Editor/> </AutoFormElement> <AutoFormElement layoutConstraint="colSpan:2"> <Property name="name">bz</Property> <Property name="property">bz</Property> <Editor/> @@ -589,11 +627,19 @@ <Children> <Container> <IFrame id="iFrame"> <Property name="userData"></Property> <Property name="path">com.fzzy.api.view.ApiLog.d</Property> <Property name="userData"> <Entity> <Property name="deptId">deptId</Property> </Entity> </Property> </IFrame> </Container> </Children> <Tools/> </Dialog> <ListDropDown id="listDropYN"> <Property name="items">是,否</Property> </ListDropDown> </View> </ViewConfig> src/main/java/com/fzzy/whjl/view/WhjlApi1103.view.xml
@@ -53,6 +53,27 @@ <Property></Property> <Property name="label">备注</Property> </PropertyDef> <PropertyDef name="bizId"> <Property></Property> <Property name="label">业务ID</Property> </PropertyDef> <PropertyDef name="updateTime"> <Property name="dataType">Date</Property> <Property name="label">更新时间</Property> </PropertyDef> <PropertyDef name="czbz"> <Property></Property> <Property name="label">操作标志</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("CZBZ")}</Property> <Property name="keyProperty">code</Property> <Property name="valueProperty">name</Property> </Property> </PropertyDef> <PropertyDef name="kqdm"> <Property></Property> <Property name="label">库区代码</Property> </PropertyDef> </DataType> </Model> <View layout="regionPadding:10"> @@ -269,6 +290,26 @@ <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">bizId</Property> <Property name="property">bizId</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">updateTime</Property> <Property name="property">updateTime</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">czbz</Property> <Property name="property">czbz</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">kqdm</Property> <Property name="property">kqdm</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">bz</Property> <Property name="property">bz</Property> <Editor/> @@ -306,14 +347,19 @@ <Children> <Container> <IFrame id="iFrame"> <Property name="userData"></Property> <Property name="path">com.fzzy.api.view.ApiLog.d</Property> <Property name="userData"> <Entity> <Property name="deptId">deptId</Property> </Entity> </Property> </IFrame> </Container> </Children> <Tools/> </Dialog> <ListDropDown id="listDropXL"> <Property name="items">博士，硕士，本科，大专，中专，高中，初中</Property> <Property name="items">博士,硕士,本科,大专,中专,高中,初中</Property> </ListDropDown> <ListDropDown id="listDropYN"> <Property name="items">是,否</Property> src/main/java/com/fzzy/whjl/view/WhjlApi1104.view.xml
@@ -73,6 +73,27 @@ <Property></Property> <Property name="label">备注</Property> </PropertyDef> <PropertyDef name="bizId"> <Property></Property> <Property name="label">业务ID</Property> </PropertyDef> <PropertyDef name="updateTime"> <Property name="dataType">Date</Property> <Property name="label">更新时间</Property> </PropertyDef> <PropertyDef name="czbz"> <Property></Property> <Property name="label">操作标志</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("CZBZ")}</Property> <Property name="keyProperty">code</Property> <Property name="valueProperty">name</Property> </Property> </PropertyDef> <PropertyDef name="kqdm"> <Property></Property> <Property name="label">库区代码</Property> </PropertyDef> </DataType> <DataType name="dtGBArea"> <Property name="creationType">com.fzzy.api.entity.GbArea</Property> @@ -340,6 +361,26 @@ <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">bizId</Property> <Property name="property">bizId</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">updateTime</Property> <Property name="property">updateTime</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">czbz</Property> <Property name="property">czbz</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">kqdm</Property> <Property name="property">kqdm</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">bz</Property> <Property name="property">bz</Property> <Editor/> @@ -424,7 +465,12 @@ <Children> <Container> <IFrame id="iFrame"> <Property name="userData"></Property> <Property name="path">com.fzzy.api.view.ApiLog.d</Property> <Property name="userData"> <Entity> <Property name="deptId">deptId</Property> </Entity> </Property> </IFrame> </Container> </Children> src/main/java/com/fzzy/whjl/view/WhjlApi1105.view.xml
@@ -127,6 +127,27 @@ <Property></Property> <Property name="label">是否有效</Property> </PropertyDef> <PropertyDef name="bizId"> <Property></Property> <Property name="label">业务ID</Property> </PropertyDef> <PropertyDef name="updateTime"> <Property name="dataType">Date</Property> <Property name="label">更新时间</Property> </PropertyDef> <PropertyDef name="czbz"> <Property></Property> <Property name="label">操作标志</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("CZBZ")}</Property> <Property name="keyProperty">code</Property> <Property name="valueProperty">name</Property> </Property> </PropertyDef> <PropertyDef name="kqdm"> <Property></Property> <Property name="label">库区代码</Property> </PropertyDef> <PropertyDef name="bz"> <Property></Property> <Property name="label">备注</Property> @@ -422,6 +443,26 @@ <Property name="trigger">listDropYN</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">bizId</Property> <Property name="property">bizId</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">updateTime</Property> <Property name="property">updateTime</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">czbz</Property> <Property name="property">czbz</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">kqdm</Property> <Property name="property">kqdm</Property> <Editor/> </AutoFormElement> <AutoFormElement layoutConstraint="colSpan:3"> <Property name="name">bz</Property> <Property name="property">bz</Property> @@ -460,7 +501,12 @@ <Children> <Container> <IFrame id="iFrame"> <Property name="userData"></Property> <Property name="path">com.fzzy.api.view.ApiLog.d</Property> <Property name="userData"> <Entity> <Property name="deptId">deptId</Property> </Entity> </Property> </IFrame> </Container> </Children> src/main/java/com/fzzy/whjl/view/WhjlApi1106.view.xml
@@ -107,6 +107,27 @@ <Property></Property> <Property name="label">备注</Property> </PropertyDef> <PropertyDef name="bizId"> <Property></Property> <Property name="label">业务ID</Property> </PropertyDef> <PropertyDef name="updateTime"> <Property name="dataType">Date</Property> <Property name="label">更新时间</Property> </PropertyDef> <PropertyDef name="czbz"> <Property></Property> <Property name="label">操作标志</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("CZBZ")}</Property> <Property name="keyProperty">code</Property> <Property name="valueProperty">name</Property> </Property> </PropertyDef> <PropertyDef name="kqdm"> <Property></Property> <Property name="label">库区代码</Property> </PropertyDef> </DataType> </Model> <View layout="regionPadding:10"> @@ -379,6 +400,26 @@ <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">bizId</Property> <Property name="property">bizId</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">updateTime</Property> <Property name="property">updateTime</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">czbz</Property> <Property name="property">czbz</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">kqdm</Property> <Property name="property">kqdm</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">bz</Property> <Property name="property">bz</Property> <Editor/> @@ -416,7 +457,12 @@ <Children> <Container> <IFrame id="iFrame"> <Property name="userData"></Property> <Property name="path">com.fzzy.api.view.ApiLog.d</Property> <Property name="userData"> <Entity> <Property name="deptId">deptId</Property> </Entity> </Property> </IFrame> </Container> </Children> src/main/java/com/fzzy/whjl/view/WhjlApi1107.view.xml
@@ -6,43 +6,43 @@ <DataType name="dtMain"> <Property name="creationType">com.fzzy.whjl.dto.WhjlApi1107</Property> <PropertyDef name="hwbh"> <Property/> <Property></Property> <Property name="label">货位编号</Property> </PropertyDef> <PropertyDef name="jlqybh"> <Property/> <Property></Property> <Property name="label">军粮企业编号</Property> </PropertyDef> <PropertyDef name="jlqymc"> <Property/> <Property></Property> <Property name="label">军粮企业名称</Property> </PropertyDef> <PropertyDef name="jgzdbh"> <Property/> <Property></Property> <Property name="label">军供站点编号</Property> </PropertyDef> <PropertyDef name="jgzdmc"> <Property/> <Property></Property> <Property name="label">军供站点名称</Property> </PropertyDef> <PropertyDef name="sscfbh"> <Property/> <Property></Property> <Property name="label">仓房编号</Property> </PropertyDef> <PropertyDef name="sscfmc"> <Property/> <Property></Property> <Property name="label">仓房名称</Property> </PropertyDef> <PropertyDef name="ssajbh"> <Property/> <Property></Property> <Property name="label">廒间编号</Property> </PropertyDef> <PropertyDef name="ajmc"> <Property/> <Property></Property> <Property name="label">廒间名称</Property> </PropertyDef> <PropertyDef name="hwmc"> <Property/> <Property></Property> <Property name="label">货位名称</Property> </PropertyDef> <PropertyDef name="hwqyrq"> @@ -50,7 +50,7 @@ <Property name="label">货位启用日期</Property> </PropertyDef> <PropertyDef name="hwzt"> <Property/> <Property></Property> <Property name="label">货位状态</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("CFZT")}</Property> @@ -59,7 +59,7 @@ </Property> </PropertyDef> <PropertyDef name="clfs"> <Property/> <Property></Property> <Property name="label">储粮方式</Property> <Property name="mapping"> <Property name="keyProperty">key</Property> @@ -84,12 +84,33 @@ <Property name="displayFormat">#0.00吨</Property> </PropertyDef> <PropertyDef name="sfyx"> <Property/> <Property></Property> <Property name="label">是否有效</Property> </PropertyDef> <PropertyDef name="bz"> <Property/> <Property></Property> <Property name="label">备注</Property> </PropertyDef> <PropertyDef name="bizId"> <Property></Property> <Property name="label">业务ID</Property> </PropertyDef> <PropertyDef name="updateTime"> <Property name="dataType">Date</Property> <Property name="label">更新时间</Property> </PropertyDef> <PropertyDef name="czbz"> <Property></Property> <Property name="label">操作标志</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("CZBZ")}</Property> <Property name="keyProperty">code</Property> <Property name="valueProperty">name</Property> </Property> </PropertyDef> <PropertyDef name="kqdm"> <Property></Property> <Property name="label">库区代码</Property> </PropertyDef> </DataType> </Model> @@ -334,6 +355,26 @@ <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">bizId</Property> <Property name="property">bizId</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">updateTime</Property> <Property name="property">updateTime</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">czbz</Property> <Property name="property">czbz</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">kqdm</Property> <Property name="property">kqdm</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">bz</Property> <Property name="property">bz</Property> <Editor/> @@ -371,7 +412,12 @@ <Children> <Container> <IFrame id="iFrame"> <Property name="userData"></Property> <Property name="path">com.fzzy.api.view.ApiLog.d</Property> <Property name="userData"> <Entity> <Property name="deptId">deptId</Property> </Entity> </Property> </IFrame> </Container> </Children> src/main/java/com/fzzy/whjl/view/WhjlApi1111.view.xml
@@ -6,121 +6,137 @@ <DataType name="dtMain"> <Property name="creationType">com.fzzy.whjl.dto.WhjlApi1111</Property> <PropertyDef name="sbbh"> <Property/> <Property></Property> <Property name="label">设备编号</Property> </PropertyDef> <PropertyDef name="jlqybh"> <Property/> <Property></Property> <Property name="label">军粮企业编号</Property> </PropertyDef> <PropertyDef name="jlqymc"> <Property/> <Property></Property> <Property name="label">军粮企业名称</Property> </PropertyDef> <PropertyDef name="jgzdbh"> <Property/> <Property></Property> <Property name="label">军供站点编号</Property> </PropertyDef> <PropertyDef name="jgzdmc"> <Property/> <Property></Property> <Property name="label">军供站点名称</Property> </PropertyDef> <PropertyDef name="cfbh"> <Property/> <Property></Property> <Property name="label">仓房编号</Property> </PropertyDef> <PropertyDef name="sscfmc"> <Property/> <Property></Property> <Property name="label">仓房名称</Property> </PropertyDef> <PropertyDef name="sblxbh"> <Property/> <Property></Property> <Property name="label">设备类型编号</Property> </PropertyDef> <PropertyDef name="sbmc"> <Property/> <Property></Property> <Property name="label">设备名称</Property> </PropertyDef> <PropertyDef name="sbzt"> <Property/> <Property></Property> <Property name="label">设备状态</Property> </PropertyDef> <PropertyDef name="ggxh"> <Property/> <Property></Property> <Property name="label">规格型号</Property> </PropertyDef> <PropertyDef name="zzdw"> <Property/> <Property></Property> <Property name="label">制造单位</Property> </PropertyDef> <PropertyDef name="cgsj"> <Property/> <Property></Property> <Property name="label">采购时间</Property> <Property name="dataType">Date</Property> </PropertyDef> <PropertyDef name="gl"> <Property/> <Property></Property> <Property name="label">功率</Property> </PropertyDef> <PropertyDef name="cl"> <Property/> <Property></Property> <Property name="label">产量</Property> </PropertyDef> <PropertyDef name="wxcc"> <Property/> <Property></Property> <Property name="label">外形尺寸</Property> </PropertyDef> <PropertyDef name="zygn"> <Property/> <Property></Property> <Property name="label">主要功能</Property> </PropertyDef> <PropertyDef name="bgfzrmc"> <Property/> <Property></Property> <Property name="label">保管负责人</Property> </PropertyDef> <PropertyDef name="whgzrmc"> <Property/> <Property></Property> <Property name="label">维护负责人</Property> </PropertyDef> <PropertyDef name="czfzrmc"> <Property/> <Property></Property> <Property name="label">操作负责人</Property> </PropertyDef> <PropertyDef name="zynhyq"> <Property/> <Property></Property> <Property name="label">主要保管要求</Property> </PropertyDef> <PropertyDef name="xgrq"> <Property/> <Property></Property> <Property name="label">修改日期</Property> <Property name="dataType">Date</Property> </PropertyDef> <PropertyDef name="tbrmc"> <Property/> <Property></Property> <Property name="label">填表人名称</Property> </PropertyDef> <PropertyDef name="Sfytkk"> <Property/> <PropertyDef name="sfytkk"> <Property></Property> <Property name="label">是否云台可控</Property> <Property name="mapping"> <Property name="keyProperty">key</Property> <Property name="valueProperty">value</Property> <Property name="mapValues"> <Collection> <Entity> <Property name="key">0</Property> <Property name="value">否</Property> </Entity> <Entity> <Property name="key">1</Property> <Property name="value">是</Property> </Entity> </Collection> </Property> </Property> </PropertyDef> <PropertyDef name="ipdz"> <Property/> <Property></Property> <Property name="label">IP地址</Property> </PropertyDef> <PropertyDef name="Gldk"> <PropertyDef name="gldk"> <Property name="dataType">Integer</Property> <Property name="label">管理端口</Property> </PropertyDef> <PropertyDef name="sdkdk"> <Property/> <Property></Property> <Property name="label">Sdk端口</Property> </PropertyDef> <PropertyDef name="zh"> <Property/> <Property></Property> <Property name="label">帐号</Property> </PropertyDef> <PropertyDef name="mm"> <Property/> <Property></Property> <Property name="label">密码</Property> </PropertyDef> <PropertyDef name="rstpdz"> @@ -128,24 +144,45 @@ <Property name="label">Rtsp地址</Property> </PropertyDef> <PropertyDef name="rtspdk"> <Property/> <Property></Property> <Property name="label">rtsp端口</Property> </PropertyDef> <PropertyDef name="sbxlh"> <Property/> <Property></Property> <Property name="label">设备序列号</Property> </PropertyDef> <PropertyDef name="Jklx"> <Property/> <PropertyDef name="jklx"> <Property></Property> <Property name="label">监控类型</Property> </PropertyDef> <PropertyDef name="sfyx"> <Property/> <Property></Property> <Property name="label">是否有效</Property> </PropertyDef> <PropertyDef name="bz"> <Property/> <Property></Property> <Property name="label">备注</Property> </PropertyDef> <PropertyDef name="bizId"> <Property></Property> <Property name="label">业务ID</Property> </PropertyDef> <PropertyDef name="updateTime"> <Property name="dataType">Date</Property> <Property name="label">更新时间</Property> </PropertyDef> <PropertyDef name="czbz"> <Property></Property> <Property name="label">操作标志</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("CZBZ")}</Property> <Property name="keyProperty">code</Property> <Property name="valueProperty">name</Property> </Property> </PropertyDef> <PropertyDef name="kqdm"> <Property></Property> <Property name="label">库区代码</Property> </PropertyDef> </DataType> </Model> @@ -242,30 +279,39 @@ </RowSelectorColumn> <DataColumn name="sbmc"> <Property name="property">sbmc</Property> <Property name="align">center</Property> </DataColumn> <DataColumn name="cfbh"> <Property name="property">cfbh</Property> <Property name="align">center</Property> </DataColumn> <DataColumn name="sscfmc"> <Property name="property">sscfmc</Property> <Property name="align">center</Property> </DataColumn> <DataColumn name="sbzt"> <Property name="property">sbzt</Property> <Property name="align">center</Property> </DataColumn> <DataColumn name="cgsj"> <Property name="property">cgsj</Property> <Property name="align">center</Property> </DataColumn> <DataColumn name="gl"> <Property name="property">gl</Property> <Property name="align">center</Property> </DataColumn> <DataColumn name="wxcc"> <Property name="property">wxcc</Property> <Property name="align">center</Property> </DataColumn> <DataColumn name="zygn"> <Property name="property">zygn</Property> <Property name="align">center</Property> </DataColumn> <DataColumn name="sfyx"> <Property name="property">sfyx</Property> <Property name="align">center</Property> </DataColumn> </DataGrid> </Container> @@ -348,6 +394,7 @@ <AutoFormElement> <Property name="name">sbzt</Property> <Property name="property">sbzt</Property> <Property name="trigger">listDropZT</Property> <Editor/> </AutoFormElement> <AutoFormElement> @@ -416,8 +463,8 @@ <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">Sfytkk</Property> <Property name="property">Sfytkk</Property> <Property name="name">sfytkk</Property> <Property name="property">sfytkk</Property> <Editor/> </AutoFormElement> <AutoFormElement> @@ -426,8 +473,8 @@ <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">Gldk</Property> <Property name="property">Gldk</Property> <Property name="name">gldk</Property> <Property name="property">gldk</Property> <Editor/> </AutoFormElement> <AutoFormElement> @@ -461,13 +508,35 @@ <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">Jklx</Property> <Property name="property">Jklx</Property> <Property name="name">jklx</Property> <Property name="property">jklx</Property> <Property name="trigger">listDropType</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">sfyx</Property> <Property name="property">sfyx</Property> <Property name="trigger">listDropYN</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">bizId</Property> <Property name="property">bizId</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">updateTime</Property> <Property name="property">updateTime</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">czbz</Property> <Property name="property">czbz</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">kqdm</Property> <Property name="property">kqdm</Property> <Editor/> </AutoFormElement> <AutoFormElement> @@ -508,7 +577,12 @@ <Children> <Container> <IFrame id="iFrame"> <Property name="userData"></Property> <Property name="path">com.fzzy.api.view.ApiLog.d</Property> <Property name="userData"> <Entity> <Property name="deptId">deptId</Property> </Entity> </Property> </IFrame> </Container> </Children> @@ -517,5 +591,11 @@ <ListDropDown id="listDropYN"> <Property name="items">是,否</Property> </ListDropDown> <ListDropDown id="listDropType"> <Property name="items">仓内,库区,运输在途,其他</Property> </ListDropDown> <ListDropDown id="listDropZT"> <Property name="items">在库,领用,报废</Property> </ListDropDown> </View> </ViewConfig> src/main/java/com/fzzy/whjl/view/pr/WhjlApi1105PR.java
@@ -77,7 +77,7 @@ infoData.setId(data.getBizId()); infoData.setKqdm(data.getKqdm()); infoData.setInteType(WhjlConstant.API_CATEGORY_11); infoData.setInteId(WhjlConstant.API_CODE_1104); infoData.setInteId(WhjlConstant.API_CODE_1105); infoData.setUpdateTime(new Date()); infoData.setDataId(data.getBizId()); infoData.setData(JSON.toJSONString(data));
