改前后端传数据格式

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/inventory/controller/ItdmSampleExpireController.java

@@ -10,6 +10,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.modules.inventory.convert.ItdmSampleExpireConvert;
+import org.jeecg.modules.inventory.dto.ItdmSampleExpireDTO;
 import org.jeecg.modules.inventory.entity.ItdmSampleExpire;
 import org.jeecg.modules.inventory.entity.ItdmSampleExpireReal;
 import org.jeecg.modules.inventory.entity.ItdmSampleInventory;
@@ -90,16 +92,17 @@ public class ItdmSampleExpireController extends JeecgController<ItdmSampleExpire
 
 	/**
 	 *   添加
-	 *
-	 * @param itdmSampleExpire
-	 * @return
 	 */
 	@AutoLog(value = "样品过期表-添加")
 	@ApiOperation(value="样品过期表-添加", notes="样品过期表-添加")
 	//@RequiresPermissions("org.jeecg.modules:itdm_sample_expire:add")
 	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody ItdmSampleExpire itdmSampleExpire) {
-		List<String> barcodeList = Arrays.asList(itdmSampleExpire.getBarCodes().split(","));
+	public Result<String> add(@RequestBody ItdmSampleExpireDTO dto) {
+		List<String> barcodeList = dto.getBarCodes();
+		String barcodes = String.join(",",barcodeList);
+		ItdmSampleExpire itdmSampleExpire = ItdmSampleExpireConvert.INSTANCE.convert(dto,barcodes);
+//		List<String> barcodeList = Arrays.asList(itdmSampleExpire.getBarCodes().split(","));
+
 		String samples = "";
 		for(String barcode:barcodeList){
 			ItdmSampleInventory inventory = inventoryService.getByBarCode(barcode);
@@ -113,17 +116,17 @@ public class ItdmSampleExpireController extends JeecgController<ItdmSampleExpire
 
 	/**
 	 *  编辑
-	 *
-	 * @param itdmSampleExpire
-	 * @return
 	 */
 	@AutoLog(value = "样品过期表-编辑")
 	@ApiOperation(value="样品过期表-编辑", notes="样品过期表-编辑")
 	//@RequiresPermissions("org.jeecg.modules:itdm_sample_expire:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody ItdmSampleExpire itdmSampleExpire) {
+	public Result<String> edit(@RequestBody ItdmSampleExpireDTO dto) {
+		List<String> barcodeList = dto.getBarCodes();
+		String barcodes = String.join(",",barcodeList);
+		ItdmSampleExpire itdmSampleExpire = ItdmSampleExpireConvert.INSTANCE.convert(dto,barcodes);
+
 		if(itdmSampleExpire.getAuditStatus().equals("0")){ //0未审批1审批通过2审批拒绝
-			List<String> barcodeList = Arrays.asList(itdmSampleExpire.getBarCodes().split(","));
 			String samples = "";
 			for(String barcode:barcodeList){
 				ItdmSampleInventory inventory = inventoryService.getByBarCode(barcode);
@@ -174,8 +177,11 @@ public class ItdmSampleExpireController extends JeecgController<ItdmSampleExpire
 	//@RequiresPermissions("org.jeecg.modules:itdm_sample_expire:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		itdmSampleExpireService.removeById(id);
-		return Result.OK("删除成功!");
+		ItdmSampleExpire itdmSampleExpire = itdmSampleExpireService.getById(id);
+		if(itdmSampleExpire.getAuditStatus().equals("0")){
+			itdmSampleExpireService.removeById(id);
+			return Result.OK("删除成功!");
+		}else return Result.error("已审批，不可删除！");
 	}
 
 	/**
@@ -189,8 +195,14 @@ public class ItdmSampleExpireController extends JeecgController<ItdmSampleExpire
 	//@RequiresPermissions("org.jeecg.modules:itdm_sample_expire:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.itdmSampleExpireService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
+		List<String> list = Arrays.asList(ids.split(","));
+		List<String> idList = new ArrayList<>();
+		for (String id :list){
+			ItdmSampleExpire itdmSampleExpire = itdmSampleExpireService.getById(id);
+			if(itdmSampleExpire.getAuditStatus().equals("0")) idList.add(id);
+		}
+		this.itdmSampleExpireService.removeByIds(idList);
+		return Result.OK("未审批部分批量删除成功!");
 	}
 
 	/**

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/inventory/convert/ItdmSampleExpireConvert.java

@@ -0,0 +1,21 @@
+package org.jeecg.modules.inventory.convert;
+
+import org.jeecg.modules.inventory.dto.ItdmSampleExpireDTO;
+import org.jeecg.modules.inventory.entity.ItdmSampleExpire;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.ReportingPolicy;
+import org.mapstruct.factory.Mappers;
+import org.springframework.util.CollectionUtils;
+
+import java.util.stream.Collectors;
+
+@Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE,imports ={ CollectionUtils.class, Collectors.class})
+public interface ItdmSampleExpireConvert {
+
+    ItdmSampleExpireConvert INSTANCE = Mappers.getMapper(ItdmSampleExpireConvert.class);
+
+    @Mapping(target ="barCodes",source ="barCodes")
+    ItdmSampleExpire convert(ItdmSampleExpireDTO dto, String barCodes);
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/inventory/convert/ItdmSampleExpireRealConvert.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.inventory.entity.ItdmSampleExpireReal;
 import org.jeecg.modules.inventory.entity.ItdmSampleInventory;
 import org.jeecg.modules.inventory.vo.ItdmSampleExpireRealListVO;
-import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
-import org.jeecg.modules.itdmGongDan.vo.ItdmGongdanDetailListVO;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.ReportingPolicy;
@@ -21,7 +19,6 @@ public interface ItdmSampleExpireRealConvert {
 
     ItdmSampleExpireRealConvert INSTANCE = Mappers.getMapper(ItdmSampleExpireRealConvert.class);
 
-//    @Mapping(target ="",source ="results")
     ItdmSampleExpireRealListVO convert(ItdmSampleExpireReal real, ItdmSampleInventory inventory);
 
     @Mapping(target ="records",source ="results" )

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/inventory/dto/ItdmSampleExpireDTO.java

@@ -0,0 +1,66 @@
+package org.jeecg.modules.inventory.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+public class ItdmSampleExpireDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**主键*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+    /**过期的条码列表*/
+    @Excel(name = "过期的条码列表", width = 15, dictTable = "itdm_inventory_barcode", dicText = "bar_code", dicCode = "id")
+    @Dict(dictTable = "itdm_inventory_barcode", dicText = "bar_code", dicCode = "bar_code")
+    @ApiModelProperty(value = "过期的条码列表")
+    private List<String> barCodes;
+    /**处理方式*/
+    @Excel(name = "处理方式", width = 15)
+    @ApiModelProperty(value = "处理方式")
+    private java.lang.String handlingMethod;
+    /**审核状态*/
+    @Excel(name = "审核状态", width = 15, dicCode = "audit_status")
+    @Dict(dicCode = "audit_status")
+    @ApiModelProperty(value = "审核状态")
+    private java.lang.String auditStatus;
+    /**拒绝原因*/
+    @Excel(name = "拒绝原因", width = 15)
+    @ApiModelProperty(value = "拒绝原因")
+    private java.lang.String rejectReason;
+    /**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+    /**创建日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+    /**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+    /**更新日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+    /**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+    /**样品列表*/
+    @ApiModelProperty(value = "样品列表")
+    private java.lang.String samples;
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/largeScreen/component/WebSocketServer3.java

@@ -82,22 +82,89 @@ public class WebSocketServer3 {
     public void onMessage(String message, Session session) throws IOException, EncodeException {
 
         System.out.println("WebSocketServer3来自客户端的消息:" + message);
-        if(message.equals("打开大屏")){
-
-            List<Map<String,Object>> list = new ArrayList<>();//清空原来的数据
-
-            ItdmDaping daping = new ItdmDaping();
-            daping.setId(1);
-            daping.setDakaidaping(1);
-
-            Map<String, Object> map = new HashMap<>();
-            map.put("data",daping.getDakaidaping()); //打开大屏
+        List<Map<String,Object>> list = new ArrayList<>();//清空原来的数据
+        Map<String, Object> map = new HashMap<>();
+        if(message.contains("打开大屏")){
+            map.put("data",1); //打开大屏
             map.put("name","打开大屏");
-            list.add(map);
-
-            sendAll(list);
+        }else if(message.contains("委托登记")){
+            map.put("data",1);
+            map.put("name","委托登记");
+        }else if(message.contains("委托审核")){
+            map.put("data",1);
+            map.put("name","委托审核");
+        }else if(message.contains("委托查询")){
+            map.put("data",1);
+            map.put("name","委托查询");
+        }else if(message.contains("委托结项")){
+            map.put("data",1);
+            map.put("name","委托结项");
+        }else if(message.contains("计划排期")){
+            map.put("data",1);
+            map.put("name","计划排期");
+        }else if(message.contains("拆解工单")){
+            map.put("data",1);
+            map.put("name","拆解工单");
+        }else if(message.contains("工单查询")){
+            map.put("data",1);
+            map.put("name","工单查询");
+        }else if(message.contains("条码打印")){
+            map.put("data",1);
+            map.put("name","条码打印");
+        }else if(message.contains("工单确认")){
+            map.put("data",1);
+            map.put("name","工单确认");
+        }else if(message.contains("数据确认")){
+            map.put("data",1);
+            map.put("name","数据确认");
+        }else if(message.contains("模板管理")){
+            map.put("data",1);
+            map.put("name","模板管理");
+        }else if(message.contains("报告生成")){
+            map.put("data",1);
+            map.put("name","报告生成");
+        }else if(message.contains("运行时间")){
+            map.put("data",1);
+            map.put("name","运行时间");
+        }else if(message.contains("报警统计")){
+            map.put("data",1);
+            map.put("name","报警统计");
+        }else if(message.contains("历史报警")){
+            map.put("data",1);
+            map.put("name","历史报警");
+        }else if(message.contains("设备数据")){
+            map.put("data",1);
+            map.put("name","设备数据");
+        }else if(message.contains("环境数据")){
+            map.put("data",1);
+            map.put("name","环境数据");
+        }else if(message.contains("人员管理")){
+            map.put("data",1);
+            map.put("name","人员管理");
+        }else if(message.contains("设备管理")){
+            map.put("data",1);
+            map.put("name","设备管理");
+        }else if(message.contains("客户管理")){
+            map.put("data",1);
+            map.put("name","客户管理");
+        }else if(message.contains("传感器管理")){
+            map.put("data",1);
+            map.put("name","传感器管理");
+        }else if(message.contains("检测依据")){
+            map.put("data",1);
+            map.put("name","检测依据");
+        }else if(message.contains("阈值管理")){
+            map.put("data",1);
+            map.put("name","阈值管理");
+        }else if(message.contains("系统配置")){
+            map.put("data",1);
+            map.put("name","系统配置");
+        }else if(message.contains("数据字典")){
+            map.put("data",1);
+            map.put("name","数据字典");
         }
-
+        list.add(map);
+        sendAll(list);
     }
 
     /**