电缆分段调整

src/main/java/com/jeeplus/modules/sg/raiseCapitalDesign/entity/DisposeCableData.java

@@ -0,0 +1,34 @@
+package com.jeeplus.modules.sg.raiseCapitalDesign.entity;
+
+/**
+ * @create: 2021-08-12 9:28
+ **/
+public class DisposeCableData {
+    private String id;
+    private String key;
+    private String number;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getNumber() {
+        return number;
+    }
+
+    public void setNumber(String number) {
+        this.number = number;
+    }
+}

src/main/java/com/jeeplus/modules/sg/raiseCapitalDesign/entity/InventoryData.java

@@ -0,0 +1,18 @@
+package com.jeeplus.modules.sg.raiseCapitalDesign.entity;
+
+import java.util.List;
+/**
+ * 拆旧材料清册List entity
+ * @author enford
+ */
+public class InventoryData {
+    private List<InventoryInfo> inventoryList;
+
+    public List<InventoryInfo> getInventoryList() {
+        return inventoryList;
+    }
+
+    public void setInventoryList(List<InventoryInfo> inventoryList) {
+        this.inventoryList = inventoryList;
+    }
+}

src/main/java/com/jeeplus/modules/sg/raiseCapitalDesign/entity/InventoryInfo.java

@@ -0,0 +1,62 @@
+package com.jeeplus.modules.sg.raiseCapitalDesign.entity;
+
+/**
+ * 拆旧材料清册 entity
+ * @author enford
+ */
+public class InventoryInfo {
+    private String num; //序号
+    private String name;    //名称
+    private String specifications;  //规格
+    private String company; //单位
+    private String quantity;    //数量
+    private String remarks; //备注
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getSpecifications() {
+        return specifications;
+    }
+
+    public void setSpecifications(String specifications) {
+        this.specifications = specifications;
+    }
+
+    public String getCompany() {
+        return company;
+    }
+
+    public void setCompany(String company) {
+        this.company = company;
+    }
+
+    public String getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(String quantity) {
+        this.quantity = quantity;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+}

src/main/java/com/jeeplus/modules/sg/raiseCapitalDesign/service/RaiseCapitalDesignService.java

@@ -18,15 +18,12 @@ import com.jeeplus.modules.sg.raiseCapital.entity.RaiseCapital;
 import com.jeeplus.modules.sg.raiseCapital.mapper.RaiseCapitalMapper;
 import com.jeeplus.modules.sg.raiseCapital.utils.RaiseExportUtil;
 import com.jeeplus.modules.sg.raiseCapital.utils.RaiseTemplate;
-import com.jeeplus.modules.sg.raiseCapitalDesign.entity.DisposeData;
-import com.jeeplus.modules.sg.raiseCapitalDesign.entity.CableSectionData;
-import com.jeeplus.modules.sg.raiseCapitalDesign.entity.CableSectionInfo;
-import com.jeeplus.modules.sg.raiseCapitalDesign.entity.VoltageData;
-import com.jeeplus.modules.sg.raiseCapitalDesign.entity.VoltageInfo;
+import com.jeeplus.modules.sg.raiseCapitalDesign.entity.*;
 import com.jeeplus.modules.sg.raiseCapitalDesign.mapper.RaiseCapitalDesignMapper;
 import com.jeeplus.modules.sys.entity.DictValue;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.test.one.dialog.mapper.Leave1Mapper;
+import io.swagger.models.auth.In;
 import net.oschina.j2cache.CacheChannel;
 import net.oschina.j2cache.J2Cache;
 import net.oschina.j2cache.redis.RedisCacheProvider;
@@ -270,6 +267,26 @@ public class RaiseCapitalDesignService extends CrudService<RaiseCapitalDesignMap
 		}
 		return voltageDisposeDataList;
 	}
+	/**
+	 * 遍历查询结构 大类 中类 小类
+	 * 去除重复，记录大类
+	 * 根据大类查询它的中类放入list并记录
+	 */
+	public List<DisposeCableData> disposeFormCableDataList(String uuid) {
+		//创建通道，查询redis中数据
+		List<DisposeCableData> voltageDisposeDataList = Lists.newArrayList();
+		CacheChannel channel = J2Cache.getChannel();
+		RedisClient client = ((RedisCacheProvider)channel.getL2Provider()).getRedisClient();
+		BinaryJedisCommands binaryJedisCommands = client.get();
+		byte[] voltageDisposeBytes = binaryJedisCommands.get((uuid+"cableDisposeData").getBytes());
+		String voltageDisposeItem = null;
+		if(null != voltageDisposeBytes){
+			voltageDisposeItem = new String(voltageDisposeBytes);
+			if(StringUtils.isNotBlank(voltageDisposeItem))
+				voltageDisposeDataList = JSON.parseArray(voltageDisposeItem,DisposeCableData.class);
+		}
+		return voltageDisposeDataList;
+	}
 
 	/**
 	 * 将页面数据保存到redis中
@@ -349,6 +366,25 @@ public class RaiseCapitalDesignService extends CrudService<RaiseCapitalDesignMap
 		return list;
 	}
 	/**
+	 * 根据UUID查询再拆旧材料清册redis中的数据
+	 * @return
+	 */
+	public List<InventoryInfo> getInventory(String uuidKey) {
+		List<InventoryInfo> list = Lists.newArrayList();
+		//创建通道，查询redis中数据
+		CacheChannel channel = J2Cache.getChannel();
+		RedisClient client = ((RedisCacheProvider)channel.getL2Provider()).getRedisClient();
+		BinaryJedisCommands binaryJedisCommands = client.get();
+		byte[] bytes = binaryJedisCommands.get(uuidKey.getBytes());
+		//判定是否存在这些数据的备份，有则进行处理并返回
+		if(null != bytes){
+			list = JSON.parseArray(new String(bytes),InventoryInfo.class);
+		}else{
+
+		}
+		return list;
+	}
+	/**
 	 * 根据UUID查询电缆分段再redis中的数据
 	 * @return
 	 */
@@ -411,7 +447,7 @@ public class RaiseCapitalDesignService extends CrudService<RaiseCapitalDesignMap
 	 */
 	@Transactional(readOnly = false)
 	public void saveCable(CableSectionData cableSectionData) {
-		List<DisposeData> dataList = this.CableDataList(cableSectionData);
+		List<DisposeCableData> dataList = this.CableDataList(cableSectionData);
 		List<CableSectionInfo> cableFourHundredList=cableSectionData.getCableFourHundredList();
 		List<CableSectionInfo> cableHundredAndTwentyList=cableSectionData.getCableHundredAndTwentyList();
 		List<CableSectionInfo> cableThreeHundredList=cableSectionData.getCableThreeHundredList();
@@ -432,7 +468,7 @@ public class RaiseCapitalDesignService extends CrudService<RaiseCapitalDesignMap
 		binaryJedisCommands.set((cableSectionData.getUuid()+"cableThreeHundred").getBytes(),cableThreeHundredListJson.getBytes());
 		binaryJedisCommands.set((cableSectionData.getUuid()+"cableTwoHundredForty").getBytes(),cableTwoHundredFortyListJson.getBytes());
 		binaryJedisCommands.set((cableSectionData.getUuid()+"cableSeventy").getBytes(),cableSeventyListJson.getBytes());
-		binaryJedisCommands.expire((cableSectionData.getUuid()+"voltageDisposeData").getBytes(),86400);
+		binaryJedisCommands.expire((cableSectionData.getUuid()+"cableDisposeData").getBytes(),86400);
 		binaryJedisCommands.expire((cableSectionData.getUuid()+"cableFourHundred").getBytes(),86400);
 		binaryJedisCommands.expire((cableSectionData.getUuid()+"cableHundredAndTwenty").getBytes(),86400);
 		binaryJedisCommands.expire((cableSectionData.getUuid()+"cableThreeHundred").getBytes(),86400);
@@ -446,33 +482,49 @@ public class RaiseCapitalDesignService extends CrudService<RaiseCapitalDesignMap
 	 * @param cableSectionData
 	 * @return
 	 */
-	public List<DisposeData> CableDataList(CableSectionData cableSectionData){
-		List<DisposeData> dataList = Lists.newArrayList();
+	public List<DisposeCableData> CableDataList(CableSectionData cableSectionData){
+		List<DisposeCableData> dataList = Lists.newArrayList();
 
-		DisposeData data = new DisposeData();
+		DisposeCableData data = new DisposeCableData();
 		data.setId(cableSectionData.getCableFourHundredId());
+		data.setKey("cableFourHundred");
 		data.setNumber(cableSectionData.getCableFourHundredListTotal());
 		dataList.add(data);
 
-		DisposeData dataCableHundredAndTwenty = new DisposeData();
+		DisposeCableData dataCableHundredAndTwenty = new DisposeCableData();
 		dataCableHundredAndTwenty.setId(cableSectionData.getCableHundredAndTwentyId());
+		dataCableHundredAndTwenty.setKey("HundredAndTwenty");
 		dataCableHundredAndTwenty.setNumber(cableSectionData.getCableHundredAndTwentyListTotal());
 		dataList.add(dataCableHundredAndTwenty);
 
-		DisposeData dataCableThreeHundred = new DisposeData();
+		DisposeCableData dataCableThreeHundred = new DisposeCableData();
 		dataCableThreeHundred.setId(cableSectionData.getCableThreeHundredId());
+		dataCableThreeHundred.setKey("cableThreeHundred");
 		dataCableThreeHundred.setNumber(cableSectionData.getCableThreeHundredListTotal());
 		dataList.add(dataCableThreeHundred);
 
-		DisposeData dataCableTwoHundredForty = new DisposeData();
+		DisposeCableData dataCableTwoHundredForty = new DisposeCableData();
 		dataCableTwoHundredForty.setId(cableSectionData.getCableTwoHundredFortyId());
+		dataCableTwoHundredForty.setKey("cableTwoHundredForty");
 		dataCableTwoHundredForty.setNumber(cableSectionData.getCableTwoHundredFortyListTotal());
 		dataList.add(dataCableTwoHundredForty);
 
-		DisposeData dataCableSeventy = new DisposeData();
+		DisposeCableData dataCableSeventy = new DisposeCableData();
 		dataCableSeventy.setId(cableSectionData.getCableSeventyId());
+		dataCableSeventy.setKey("cableSeventy");
 		dataCableSeventy.setNumber(cableSectionData.getCableSeventyListTotal());
 		dataList.add(dataCableSeventy);
 		return dataList;
 	}
+
+	public List<InventoryInfo> InventoryData(){
+		List<InventoryInfo> list = Lists.newArrayList();
+		InventoryInfo inventory1=new InventoryInfo();
+		inventory1.setNum("1");
+		inventory1.setName("10kV电力电缆");
+		inventory1.setNum("YJV22-8.7/15-3×400");
+		inventory1.setNum("1");
+
+		return list;
+	}
 }

src/main/java/com/jeeplus/modules/sg/raiseCapitalDesign/web/RaiseCapitalDesignController.java

@@ -21,11 +21,7 @@ import com.jeeplus.modules.sg.picking.activiti.service.PickIngService;
 import com.jeeplus.modules.sg.picking.activiti.service.ShowListService;
 import com.jeeplus.modules.sg.raiseCapital.entity.RaiseCapital;
 import com.jeeplus.modules.sg.raiseCapital.service.RaiseCapitalService;
-import com.jeeplus.modules.sg.raiseCapitalDesign.entity.DisposeData;
-import com.jeeplus.modules.sg.raiseCapitalDesign.entity.VoltageData;
-import com.jeeplus.modules.sg.raiseCapitalDesign.entity.CableSectionData;
-import com.jeeplus.modules.sg.raiseCapitalDesign.entity.CableSectionInfo;
-import com.jeeplus.modules.sg.raiseCapitalDesign.entity.VoltageInfo;
+import com.jeeplus.modules.sg.raiseCapitalDesign.entity.*;
 import com.jeeplus.modules.sg.raiseCapitalDesign.service.RaiseCapitalDesignService;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
@@ -105,6 +101,16 @@ public class RaiseCapitalDesignController extends BaseController {
 		map.put("success",true);
 		return map;
 	}
+	@RequestMapping(value = "disposeFormCableDataList")
+	@ResponseBody
+	public Map disposeFormCableDataList(String uuid) {
+		Map<String,Object> map = new HashMap<>();
+		//将新增页数据保存到redis中（item）
+		List<DisposeCableData> voltageDisposeDataList = raiseCapitalDesignService.disposeFormCableDataList(uuid);
+		map.put("data",voltageDisposeDataList);
+		map.put("success",true);
+		return map;
+	}
 
 		/**
 	 * 提资表单列表数据
@@ -178,6 +184,17 @@ public class RaiseCapitalDesignController extends BaseController {
 		model.addAttribute("uuid", uuid);
 		return "modules/sg/raiseCapitalDesign/cableSectionForm";
 	}
+	/**
+	 * 拆旧材料清册
+	 * 查看，增加，编辑提资表单表单页面
+	 */
+	@RequestMapping(value = "inventoryForm")
+	public String inventoryForm(String uuid, Model model) {
+		List<InventoryInfo> inventoryList = raiseCapitalDesignService.getInventory(uuid + "inventory");
+		model.addAttribute("inventoryList", inventoryList);
+		model.addAttribute("uuid", uuid);
+		return "modules/sg/raiseCapitalDesign/inventoryForm";
+	}
 
 	/**
 	 * 架空导线计算处理

src/main/webapp/webpage/modules/sg/raiseCapitalDesign/cableSectionForm.jsp

@@ -97,7 +97,7 @@
 						var dialogIndex = parent.layer.getFrameIndex(window.name); // 获取窗口索引
 						parent.layer.close(dialogIndex);
 						jp.success(data.msg)
-						jp.getParent().refreshCharts(uuid);
+						jp.getParent().refreshCables(uuid);
 					}else{
 						jp.error(data.msg);
 					}

src/main/webapp/webpage/modules/sg/raiseCapitalDesign/raiseCapitalDesign.js

@@ -15,6 +15,20 @@
 				}
 			})
 	}
+	/*4.2数据回填方法*/
+	function refreshCables(uuid){
+		jp.post("${ctx}/raiseCapitalDesign/disposeFormCableDataList",
+			{
+				"uuid":uuid
+			},
+			function (data) {
+				if(data.success){
+					for (var i = 0; i < data.data.length; i++) {
+						$("#"+data.data[i].id).val(data.data[i].number)
+					}
+				}
+			})
+	}
 $(document).ready(function() {
 	window.operateEvents = {
 		'change input': function (e, value, row, index) {
@@ -461,6 +475,11 @@ function cableSection(){
 	console.log(pickUuid);
 	jp.openSaveDialog('新增领料信息', "${ctx}/raiseCapitalDesign/cableSectionForm?uuid="+pickUuid, '80%', '80%');
 }
+function inventory(){
+	var pickUuid = $("#pickUuid").val();
+	console.log(pickUuid);
+	jp.openSaveDialog('新增领料信息', "${ctx}/raiseCapitalDesign/inventoryForm?uuid="+pickUuid, '80%', '80%');
+}
 
 function add(){
 	var projectName = $("#projectName").val();