动态获取密度

src/main/java/com/unissoft/interaction/controller/DensityDataController.java

@@ -0,0 +1,104 @@
+package com.unissoft.interaction.controller;
+
+
+import java.util.Date;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.unissoft.common.PageParam;
+import com.unissoft.common.ResultView;
+import com.unissoft.common.SystemLog;
+import com.unissoft.interaction.entity.DensityData;
+import com.unissoft.interaction.service.DensityDataService;
+
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author MySunshine
+ * @since 2022-05-17
+ */
+@RestController
+@RequestMapping("/density-data")
+public class DensityDataController {
+
+	private DensityDataService densityDataService;
+
+    @Autowired
+    public void setDensityDataController(DensityDataService densityDataService) {
+        this.densityDataService = densityDataService;
+    }
+    
+    /**
+     * 分页查询列表
+     * @param pageParam
+     * @return
+     */
+    @SystemLog(operModul = "参数设置", operType = "密度参数", operDesc = "查询分页密度参数")
+    @PostMapping("/getPage")
+    public ResultView getPage(@RequestBody PageParam pageParam) {
+        IPage<DensityData> page = densityDataService.getPage(pageParam);
+        return ResultView.success(page);
+    }
+    
+   
+
+    /**
+     * 新增
+     * @param densityData
+     * @return
+     */
+    @SystemLog(operModul = "参数设置", operType = "密度参数", operDesc = "密度参数新增")
+    @PostMapping("/save")
+    public ResultView saveUser(@RequestBody DensityData densityData) {
+    	densityData.setEditTime(new Date());
+        boolean save = densityDataService.save(densityData);
+        if (save)
+            return ResultView.success();
+        else
+            return ResultView.error();
+    }
+
+    /**
+     * 修改
+     * @param densityData
+     * @return
+     */
+    @SystemLog(operModul = "参数设置", operType = "密度参数", operDesc = "密度参数修改")
+    @PostMapping("/update")
+    public ResultView updateUser(@RequestBody DensityData densityData) {
+        boolean b = densityDataService.updateById(densityData);
+        if (b)
+            return ResultView.success();
+        else
+            return ResultView.error();
+    }
+    
+    
+    /**
+	 * 删除
+	 * @param id
+	 * @return
+	 */
+    @SystemLog(operModul = "参数设置", operType = "密度参数", operDesc = "密度参数删除")
+    @ApiOperation(value = "根据id删除", notes = "")
+    @DeleteMapping("/deleteById/{id}")
+    public ResultView deleteById(@PathVariable Integer id) {
+    	boolean b = densityDataService.removeById(id);
+    	if (b)
+            return ResultView.success();
+        else
+            return ResultView.error();
+    }
+}

src/main/java/com/unissoft/interaction/entity/DensityData.java

@@ -0,0 +1,50 @@
+package com.unissoft.interaction.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author MySunshine
+ * @since 2022-05-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("density_data")
+@ApiModel(value="DensityData对象", description="")
+public class DensityData implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "仓房")
+    @TableField("house_id")
+    private Integer houseId;
+
+    @ApiModelProperty(value = "密度(千克/立方米)")
+    @TableField("density")
+    private String density;
+
+    @ApiModelProperty(value = "单位id")
+    @TableField("org_id")
+    private Integer orgId;
+
+    @ApiModelProperty(value = "编辑时间")
+    @TableField("edit_time")
+    private Date editTime;
+
+
+}

src/main/java/com/unissoft/interaction/mapper/DensityDataMapper.java

@@ -0,0 +1,16 @@
+package com.unissoft.interaction.mapper;
+
+import com.unissoft.interaction.entity.DensityData;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author MySunshine
+ * @since 2022-05-17
+ */
+public interface DensityDataMapper extends BaseMapper<DensityData> {
+
+}

src/main/java/com/unissoft/interaction/mapper/DensityDataMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.unissoft.interaction.mapper.DensityDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.unissoft.interaction.entity.DensityData">
+        <id column="id" property="id" />
+        <result column="house_id" property="houseId" />
+        <result column="density" property="density" />
+        <result column="org_id" property="orgId" />
+        <result column="edit_time" property="editTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, house_id, density, org_id, edit_time
+    </sql>
+
+</mapper>

src/main/java/com/unissoft/interaction/service/DensityDataService.java

@@ -0,0 +1,20 @@
+package com.unissoft.interaction.service;
+
+import com.unissoft.common.PageParam;
+import com.unissoft.interaction.entity.DensityData;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author MySunshine
+ * @since 2022-05-17
+ */
+public interface DensityDataService extends IService<DensityData> {
+
+	IPage<DensityData> getPage(PageParam pageParam);
+
+}

src/main/java/com/unissoft/interaction/service/impl/DensityDataServiceImpl.java

@@ -0,0 +1,50 @@
+package com.unissoft.interaction.service.impl;
+
+import com.unissoft.common.PageParam;
+import com.unissoft.interaction.entity.DensityData;
+import com.unissoft.interaction.mapper.DensityDataMapper;
+import com.unissoft.interaction.service.DensityDataService;
+import com.unissoft.parameter.mapper.HardwareParameterMapper;
+import com.unissoft.parameter.model.HardwareParameter;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author MySunshine
+ * @since 2022-05-17
+ */
+@Service
+public class DensityDataServiceImpl extends ServiceImpl<DensityDataMapper, DensityData> implements DensityDataService {
+
+	private DensityDataMapper densityDataMapper;
+	@Autowired
+	public void setDensityDataService(DensityDataMapper densityDataMapper) {
+        this.densityDataMapper = densityDataMapper;
+    }
+	
+	
+	@Override
+	public IPage<DensityData> getPage(PageParam pageParam) {
+		// TODO Auto-generated method stub
+		Integer pageIndex = pageParam.getPageIndex();
+        Integer pageSize = pageParam.getPageSize();
+        // 分页对象
+        IPage<DensityData> page = new Page<>(pageIndex, pageSize);
+        
+        QueryWrapper<DensityData> ew = new QueryWrapper<>();
+       
+        return densityDataMapper.selectPage(page, ew);
+	}
+
+}

src/main/java/com/unissoft/interaction/service/impl/TeDataServiceImpl.java

@@ -3,9 +3,11 @@ package com.unissoft.interaction.service.impl;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.unissoft.interaction.algorithm.CylinderAlg;
+import com.unissoft.interaction.entity.DensityData;
 import com.unissoft.interaction.entity.ReMsg;
 import com.unissoft.interaction.entity.STask;
 import com.unissoft.interaction.entity.TeData;
+import com.unissoft.interaction.mapper.DensityDataMapper;
 import com.unissoft.interaction.mapper.ReMsgMapper;
 import com.unissoft.interaction.mapper.STaskMapper;
 import com.unissoft.interaction.mapper.TeDataMapper;
@@ -47,16 +49,6 @@ public class TeDataServiceImpl implements TeDataService {
     private TeDataMapper teDataMapper;
     private ReMsgMapper reMsgMapper;
     
-    @Resource
-    private NBasicEdgeMapper nBasicEdgeMapper;
-    @Resource
-    private PointDataMapper pointDataMapper;
-    @Resource
-    private HardwareParameterMapper hardwareParameterMapper;
-    @Resource
-    private OrgInfoMapper orgInfoMapper;
-
-
     @Autowired
     public void setsTaskMapper(STaskMapper sTaskMapper) {
         this.sTaskMapper = sTaskMapper;
@@ -71,6 +63,19 @@ public class TeDataServiceImpl implements TeDataService {
     public void setReMsgMapper(ReMsgMapper reMsgMapper) {
         this.reMsgMapper = reMsgMapper;
     }
+    
+    
+    @Resource
+    private NBasicEdgeMapper nBasicEdgeMapper;
+    @Resource
+    private PointDataMapper pointDataMapper;
+    @Resource
+    private HardwareParameterMapper hardwareParameterMapper;
+    @Resource
+    private OrgInfoMapper orgInfoMapper;
+    @Resource
+    private DensityDataMapper densityDataMapper;
+    
 
     /**
      * todo-----------暂时不用
@@ -288,16 +293,24 @@ public class TeDataServiceImpl implements TeDataService {
      */
     public void  addNBasicEdge(double lkVolume,String taskId){
     	NBasicEdge nBasicEdge = new NBasicEdge(); 
-    	String density = "500"; //密度 千克/立方米
+    	
+    	String houseId = taskId.split(",")[0];//仓房id
+    	
+    	//获取密度
+    	QueryWrapper<DensityData> densityQueryWrapper = new QueryWrapper<>();
+        List<DensityData> densityDataList = null;
+        densityQueryWrapper.eq("house_id", houseId);
+        densityDataList = densityDataMapper.selectList(densityQueryWrapper);
+        String density = "0"; //密度 千克/立方米
+        if(densityDataList.size()>0){
+        	density = densityDataList.get(0).getDensity();
+        }
 		//质量
 	    BigDecimal big_density = new BigDecimal(density); 
 	    BigDecimal big_lkVolume = new BigDecimal(lkVolume); //保留两位小数的体积
 	    BigDecimal quality = big_density.multiply(big_lkVolume).divide(new BigDecimal(1000));
 		nBasicEdge.setLkWeight(Double.parseDouble(quality+""));//单位 吨
 		
-		/*SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		Date beginTime = sdf.parse(startTime);*/
-		
 		QueryWrapper<TeData> queryWrapper = new QueryWrapper<>();
         List<TeData> teDataList = null;
         queryWrapper.eq("taskID", taskId);
@@ -308,7 +321,6 @@ public class TeDataServiceImpl implements TeDataService {
         }
         
         
-        String houseId = taskId.split(",")[0];//仓房id
         //获取仓房信息
     	OrgInfo orgInfoHouse = orgInfoMapper.selectById(Integer.parseInt(houseId));
     	
@@ -323,11 +335,11 @@ public class TeDataServiceImpl implements TeDataService {
 		
 		
 		//取上次的数据 如果大于上次的数据 则入库 否则出库
-		QueryWrapper<NBasicEdge> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("fk", orgInfo.getId());
-        queryWrapper1.orderByDesc("id");
+		QueryWrapper<NBasicEdge> nQueryWrapper = new QueryWrapper<>();
+		nQueryWrapper.eq("fk", orgInfo.getId());
+		nQueryWrapper.orderByDesc("id");
         // 分页对象
-        List<NBasicEdge> nList = nBasicEdgeMapper.selectList(queryWrapper1);
+        List<NBasicEdge> nList = nBasicEdgeMapper.selectList(nQueryWrapper);
         double v = 0 ;
         if(nList.size()>0){
              v =Double.parseDouble(nList.get(0).getLkVolume());