admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
Administrator 2023-05-11 11:54:16 +08:00
parent aeed4eb842
commit acc7de1ecb
9 changed files with 284 additions and 218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

188
src/main/java/com/zhgd/xmgl/modules/discharging/controller/DischargingPlatformDevController.java
View File

@ -1,5 +1,6 @@
package com.zhgd.xmgl.modules.discharging.controller; package com.zhgd.xmgl.modules.discharging.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.zhgd.annotation.OperLog; import com.zhgd.annotation.OperLog;
import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.jeecg.common.mybatis.EntityMap;
@ -13,20 +14,18 @@ import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.MapUtils; import org.apache.commons.collections.MapUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
* @Title: Controller * @Title: Controller
* @Description: 卸料平台-设备 * @Description: 卸料平台-设备
* @author： pds * @author： pds
* @date： 2021-04-21 * @date： 2021-04-21
* @version： V1.0 * @version： V1.0
*/ */
@RestController @RestController
@ -34,99 +33,112 @@ import java.util.Map;
@Slf4j @Slf4j
@Api(tags = "卸料平台-设备") @Api(tags = "卸料平台-设备")
public class DischargingPlatformDevController { public class DischargingPlatformDevController {
@Autowired @Autowired
private IDischargingPlatformDevService dischargingPlatformDevService; private IDischargingPlatformDevService dischargingPlatformDevService;
@ApiOperation(value = " 查询卸料平台设备列表", notes = "查询卸料平台设备列表", httpMethod="POST") @ApiOperation(value = " 查询卸料平台设备列表", notes = "查询卸料平台设备列表", httpMethod = "POST")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "query", required = true, dataType = "String"), @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "query", required = true, dataType = "String"),
}) })
@PostMapping(value = "/list") @PostMapping(value = "/list")
public Result<List<EntityMap>> selectDischargingPlatformDevList(@RequestBody Map<String, Object> map) { public Result<List<EntityMap>> selectDischargingPlatformDevList(@RequestBody Map<String, Object> map) {
List<EntityMap> pageList = dischargingPlatformDevService.selectDischargingPlatformDevList(map); List<EntityMap> pageList = dischargingPlatformDevService.selectDischargingPlatformDevList(map);
return Result.success(pageList); return Result.success(pageList);
} }
/** @ApiOperation(value = " 分页查询卸料平台设备列表", notes = "分页查询卸料平台设备列表", httpMethod = "GET")
* 添加 @GetMapping(value = "/page")
* @param dischargingPlatformDev public Result<IPage<DischargingPlatformDev>> selectDischargingPlatformDevListByPage(DischargingPlatformDev dischargingPlatformDev,
* @return @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
*/ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@OperLog(operModul = "卸料平台管理",operType = "添加卸料平台-设备",operDesc = "添加卸料平台-设备信息") HttpServletRequest req) {
@ApiOperation(value = " 添加卸料平台-设备信息", notes = "添加卸料平台-设备信息" , httpMethod="POST") return dischargingPlatformDevService.selectDischargingPlatformDevListByPage(dischargingPlatformDev, pageNo, pageSize, req);
@PostMapping(value = "/add") }
public Result<DischargingPlatformDev> add(@RequestBody DischargingPlatformDev dischargingPlatformDev) {
/**
* 添加
*
* @param dischargingPlatformDev
* @return
*/
@OperLog(operModul = "卸料平台管理", operType = "添加卸料平台-设备", operDesc = "添加卸料平台-设备信息")
@ApiOperation(value = " 添加卸料平台-设备信息", notes = "添加卸料平台-设备信息", httpMethod = "POST")
@PostMapping(value = "/add")
public Result<DischargingPlatformDev> add(@RequestBody DischargingPlatformDev dischargingPlatformDev) {
dischargingPlatformDevService.addDischargingPlatformDev(dischargingPlatformDev); dischargingPlatformDevService.addDischargingPlatformDev(dischargingPlatformDev);
return Result.ok(); return Result.ok();
} }
/** /**
* 编辑 * 编辑
* @param dischargingPlatformDev *
* @return * @param dischargingPlatformDev
*/ * @return
@OperLog(operModul = "卸料平台管理",operType = "编辑卸料平台-设备",operDesc = "编辑卸料平台-设备信息") */
@ApiOperation(value = "编辑卸料平台-设备信息", notes = "编辑卸料平台-设备信息" , httpMethod="POST") @OperLog(operModul = "卸料平台管理", operType = "编辑卸料平台-设备", operDesc = "编辑卸料平台-设备信息")
@PostMapping(value = "/edit") @ApiOperation(value = "编辑卸料平台-设备信息", notes = "编辑卸料平台-设备信息", httpMethod = "POST")
public Result<DischargingPlatformDev> edit(@RequestBody DischargingPlatformDev dischargingPlatformDev) { @PostMapping(value = "/edit")
public Result<DischargingPlatformDev> edit(@RequestBody DischargingPlatformDev dischargingPlatformDev) {
dischargingPlatformDevService.editDischargingPlatformDev(dischargingPlatformDev); dischargingPlatformDevService.editDischargingPlatformDev(dischargingPlatformDev);
return Result.ok(); return Result.ok();
} }
@OperLog(operModul = "卸料平台管理",operType = "修改卸料平台地图坐标",operDesc = "修改卸料平台地图坐标") @OperLog(operModul = "卸料平台管理", operType = "修改卸料平台地图坐标", operDesc = "修改卸料平台地图坐标")
@ApiOperation(value = "修改卸料平台地图坐标", notes = "修改卸料平台地图坐标" , httpMethod="POST") @ApiOperation(value = "修改卸料平台地图坐标", notes = "修改卸料平台地图坐标", httpMethod = "POST")
@PostMapping(value = "/updateDischargingPlatformCoordinate") @PostMapping(value = "/updateDischargingPlatformCoordinate")
public Result<DischargingPlatformDev> updateDischargingPlatformCoordinate(@RequestBody List<DischargingPlatformDev> list) { public Result<DischargingPlatformDev> updateDischargingPlatformCoordinate(@RequestBody List<DischargingPlatformDev> list) {
dischargingPlatformDevService.updateDischargingPlatformCoordinate(list); dischargingPlatformDevService.updateDischargingPlatformCoordinate(list);
return Result.ok(); return Result.ok();
} }
/** /**
* 通过id删除 * 通过id删除
* @param *
* @return * @param
*/ * @return
@OperLog(operModul = "卸料平台管理",operType = "删除卸料平台-设备",operDesc = "删除卸料平台-设备信息") */
@ApiOperation(value = "删除卸料平台-设备信息", notes = "删除卸料平台-设备信息" , httpMethod="POST") @OperLog(operModul = "卸料平台管理", operType = "删除卸料平台-设备", operDesc = "删除卸料平台-设备信息")
@ApiImplicitParam(name = "id", value = "卸料平台-设备ID", paramType = "query", required = true, dataType = "Integer") @ApiOperation(value = "删除卸料平台-设备信息", notes = "删除卸料平台-设备信息", httpMethod = "POST")
@PostMapping(value = "/delete") @ApiImplicitParam(name = "id", value = "卸料平台-设备ID", paramType = "query", required = true, dataType = "Integer")
public Result<DischargingPlatformDev> delete(@RequestBody Map<String,Object> map) { @PostMapping(value = "/delete")
Result<DischargingPlatformDev> result = new Result<DischargingPlatformDev>(); public Result<DischargingPlatformDev> delete(@RequestBody Map<String, Object> map) {
DischargingPlatformDev dischargingPlatformDev = dischargingPlatformDevService.getById(MapUtils.getString(map,"id")); Result<DischargingPlatformDev> result = new Result<DischargingPlatformDev>();
if(dischargingPlatformDev==null) { DischargingPlatformDev dischargingPlatformDev = dischargingPlatformDevService.getById(MapUtils.getString(map, "id"));
if (dischargingPlatformDev == null) {
result.error500(MessageUtil.get("notFindErr")); result.error500(MessageUtil.get("notFindErr"));
}else { } else {
boolean ok = dischargingPlatformDevService.removeById(MapUtils.getString(map,"id")); boolean ok = dischargingPlatformDevService.removeById(MapUtils.getString(map, "id"));
if(ok) { if (ok) {
result.successMsg(MessageUtil.get("deleteSucess")); result.successMsg(MessageUtil.get("deleteSucess"));
} }
} }
return result;
}
return result;
/** }
* 通过id查询
* @param
* @return /**
*/ * 通过id查询
@ApiOperation(value = "通过id查询卸料平台-设备信息", notes = "通过id查询卸料平台-设备信息" , httpMethod="POST") *
@ApiImplicitParam(name = "id", value = "卸料平台-设备ID", paramType = "query", required = true, dataType = "Integer") * @param
@PostMapping(value = "/queryById") * @return
public Result<DischargingPlatformDev> queryById(@RequestBody Map<String,Object> map) { */
Result<DischargingPlatformDev> result = new Result<DischargingPlatformDev>(); @ApiOperation(value = "通过id查询卸料平台-设备信息", notes = "通过id查询卸料平台-设备信息", httpMethod = "POST")
DischargingPlatformDev dischargingPlatformDev = dischargingPlatformDevService.getById(MapUtils.getString(map,"id")); @ApiImplicitParam(name = "id", value = "卸料平台-设备ID", paramType = "query", required = true, dataType = "Integer")
if(dischargingPlatformDev==null) { @PostMapping(value = "/queryById")
public Result<DischargingPlatformDev> queryById(@RequestBody Map<String, Object> map) {
Result<DischargingPlatformDev> result = new Result<DischargingPlatformDev>();
DischargingPlatformDev dischargingPlatformDev = dischargingPlatformDevService.getById(MapUtils.getString(map, "id"));
if (dischargingPlatformDev == null) {
result.error500(MessageUtil.get("notFindErr")); result.error500(MessageUtil.get("notFindErr"));
}else { } else {
result.setResult(dischargingPlatformDev); result.setResult(dischargingPlatformDev);
result.setSuccess(true); result.setSuccess(true);
} }
return result; return result;
} }
} }

8
src/main/java/com/zhgd/xmgl/modules/discharging/mapper/DischargingPlatformDevMapper.java
View File

@ -3,15 +3,19 @@ package com.zhgd.xmgl.modules.discharging.mapper;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
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.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.jeecg.common.mybatis.EntityMap;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import com.zhgd.xmgl.modules.discharging.entity.DischargingPlatformDev; import com.zhgd.xmgl.modules.discharging.entity.DischargingPlatformDev;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
/** /**
* @Description: 卸料平台-设备 * @Description: 卸料平台-设备
* @author： pds * @author： pds
* @date： 2021-04-21 * @date： 2021-04-21
* @version： V1.0 * @version： V1.0
*/ */
@Mapper @Mapper
@ -19,5 +23,7 @@ public interface DischargingPlatformDevMapper extends BaseMapper<DischargingPlat
List<EntityMap> selectDischargingPlatformDevList(Map<String, Object> map); List<EntityMap> selectDischargingPlatformDevList(Map<String, Object> map);
IPage<DischargingPlatformDev> selectDischargingPlatformDevListByPage(@Param("d") DischargingPlatformDev dischargingPlatformDev, Page<DischargingPlatformDev> page, QueryWrapper<DischargingPlatformDev> queryWrapper);
Map<String, Object> selectDischargingDevCount(Map<String, Object> map); Map<String, Object> selectDischargingDevCount(Map<String, Object> map);
} }

20
src/main/java/com/zhgd/xmgl/modules/discharging/mapper/xml/DischargingPlatformDevMapper.xml
View File

@ -1,18 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.discharging.mapper.DischargingPlatformDevMapper"> <mapper namespace="com.zhgd.xmgl.modules.discharging.mapper.DischargingPlatformDevMapper">
<select id="selectDischargingPlatformDevList" resultType="com.zhgd.jeecg.common.mybatis.EntityMap"> <select id="selectDischargingPlatformDevList" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
SELECT w1.*, SELECT w1.*,
IFNULL(((case when round((UNIX_TIMESTAMP(now())-UNIX_TIMESTAMP(real_time))/60)&lt;=10 then 1 else 0 end)),0) devOnline IFNULL(((case when round((UNIX_TIMESTAMP(now())-UNIX_TIMESTAMP(real_time))/60)&lt;=10 then 1 else 0 end)),0)
devOnline
from discharging_platform_dev w1 from discharging_platform_dev w1
where w1.project_sn=#{projectSn} where w1.project_sn=#{projectSn}
</select> </select>
<select id="selectDischargingPlatformDevListByPage"
resultType="com.zhgd.xmgl.modules.discharging.entity.DischargingPlatformDev">
SELECT w1.*,
IFNULL(((case when round((UNIX_TIMESTAMP(now())-UNIX_TIMESTAMP(real_time))/60)&lt;=10 then 1 else 0 end)),0)
devOnline
from discharging_platform_dev w1
where w1.project_sn=#{d.projectSn}
</select>
<select id="selectDischargingDevCount" resultType="java.util.Map" parameterType="map"> <select id="selectDischargingDevCount" resultType="java.util.Map" parameterType="map">
SELECT SELECT
COUNT(1) devNum, COUNT(1) devNum,
IFNULL(SUM((case when round((UNIX_TIMESTAMP(now())-UNIX_TIMESTAMP(real_time))/60)&lt;=10 then 1 else 0 end)),0) devOnline IFNULL(SUM((case when round((UNIX_TIMESTAMP(now())-UNIX_TIMESTAMP(real_time))/60)&lt;=10 then 1 else 0 end)),0)
devOnline
FROM discharging_platform_dev de INNER JOIN project a ON de.project_sn=a.project_sn FROM discharging_platform_dev de INNER JOIN project a ON de.project_sn=a.project_sn
INNER JOIN company cp ON a.company_sn=cp.company_sn INNER JOIN company cp ON a.company_sn=cp.company_sn
INNER JOIN company b ON cp.parent_id=b.company_id INNER JOIN company b ON cp.parent_id=b.company_id
@ -36,4 +46,4 @@
</where> </where>
</select> </select>
</mapper> </mapper>

5
src/main/java/com/zhgd/xmgl/modules/discharging/service/IDischargingPlatformDevService.java
View File

@ -1,9 +1,12 @@
package com.zhgd.xmgl.modules.discharging.service; package com.zhgd.xmgl.modules.discharging.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.modules.discharging.entity.DischargingPlatformDev; import com.zhgd.xmgl.modules.discharging.entity.DischargingPlatformDev;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import javax.servlet.http.HttpServletRequest;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -22,4 +25,6 @@ public interface IDischargingPlatformDevService extends IService<DischargingPlat
void editDischargingPlatformDev(DischargingPlatformDev dischargingPlatformDev); void editDischargingPlatformDev(DischargingPlatformDev dischargingPlatformDev);
void updateDischargingPlatformCoordinate(List<DischargingPlatformDev> list); void updateDischargingPlatformCoordinate(List<DischargingPlatformDev> list);
Result<IPage<DischargingPlatformDev>> selectDischargingPlatformDevListByPage(DischargingPlatformDev dischargingPlatformDev, Integer pageNo, Integer pageSize, HttpServletRequest req);
} }

34
src/main/java/com/zhgd/xmgl/modules/discharging/service/impl/DischargingPlatformDevServiceImpl.java
View File

@ -1,9 +1,13 @@
package com.zhgd.xmgl.modules.discharging.service.impl; package com.zhgd.xmgl.modules.discharging.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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 com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.execption.OpenAlertException;
import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.xmgl.modules.discharging.entity.DischargingPlatformDev; import com.zhgd.xmgl.modules.discharging.entity.DischargingPlatformDev;
import com.zhgd.xmgl.modules.discharging.mapper.DischargingPlatformDevMapper; import com.zhgd.xmgl.modules.discharging.mapper.DischargingPlatformDevMapper;
import com.zhgd.xmgl.modules.discharging.service.IDischargingPlatformDevService; import com.zhgd.xmgl.modules.discharging.service.IDischargingPlatformDevService;
@ -13,6 +17,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import javax.servlet.http.HttpServletRequest;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -21,7 +26,7 @@ import java.util.UUID;
/** /**
* @Description: 卸料平台-设备 * @Description: 卸料平台-设备
* @author： pds * @author： pds
* @date： 2021-04-21 * @date： 2021-04-21
* @version： V1.0 * @version： V1.0
*/ */
@Service @Service
@ -37,14 +42,14 @@ public class DischargingPlatformDevServiceImpl extends ServiceImpl<DischargingPl
@Override @Override
public void addDischargingPlatformDev(DischargingPlatformDev dischargingPlatformDev) { public void addDischargingPlatformDev(DischargingPlatformDev dischargingPlatformDev) {
if(StringUtils.isEmpty(dischargingPlatformDev.getDevSn())) { if (StringUtils.isEmpty(dischargingPlatformDev.getDevSn())) {
String uuid = UUID.randomUUID().toString().replace("-", "").toUpperCase(); String uuid = UUID.randomUUID().toString().replace("-", "").toUpperCase();
dischargingPlatformDev.setDevSn(uuid); dischargingPlatformDev.setDevSn(uuid);
}else{ } else {
QueryWrapper<DischargingPlatformDev> queryWrapper=new QueryWrapper<>(); QueryWrapper<DischargingPlatformDev> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(DischargingPlatformDev::getDevSn,dischargingPlatformDev.getDevSn()); queryWrapper.lambda().eq(DischargingPlatformDev::getDevSn, dischargingPlatformDev.getDevSn());
int count=dischargingPlatformDevMapper.selectCount(queryWrapper); int count = dischargingPlatformDevMapper.selectCount(queryWrapper);
if(count>0){ if (count > 0) {
throw new OpenAlertException(MessageUtil.get("EquipmentNumExistErr")); throw new OpenAlertException(MessageUtil.get("EquipmentNumExistErr"));
} }
} }
@ -60,11 +65,22 @@ public class DischargingPlatformDevServiceImpl extends ServiceImpl<DischargingPl
@Override @Override
public void updateDischargingPlatformCoordinate(List<DischargingPlatformDev> list) { public void updateDischargingPlatformCoordinate(List<DischargingPlatformDev> list) {
if(list!=null&&list.size()>0){ if (list != null && list.size() > 0) {
for (DischargingPlatformDev dischargingPlatformDev:list){ for (DischargingPlatformDev dischargingPlatformDev : list) {
dischargingPlatformDev.setRealTime(null); dischargingPlatformDev.setRealTime(null);
dischargingPlatformDevMapper.updateById(dischargingPlatformDev); dischargingPlatformDevMapper.updateById(dischargingPlatformDev);
} }
} }
} }
@Override
public Result<IPage<DischargingPlatformDev>> selectDischargingPlatformDevListByPage(DischargingPlatformDev dischargingPlatformDev, Integer pageNo, Integer pageSize, HttpServletRequest req) {
Result<IPage<DischargingPlatformDev>> result = new Result<IPage<DischargingPlatformDev>>();
QueryWrapper<DischargingPlatformDev> queryWrapper = QueryGenerator.initQueryWrapper(dischargingPlatformDev, req.getParameterMap());
Page<DischargingPlatformDev> page = new Page<DischargingPlatformDev>(pageNo, pageSize);
IPage<DischargingPlatformDev> pageList = dischargingPlatformDevMapper.selectDischargingPlatformDevListByPage(dischargingPlatformDev, page, queryWrapper);
result.setSuccess(true);
result.setResult(pageList);
return result;
}
} }

80
src/main/java/com/zhgd/xmgl/modules/weight/entity/WeighInfo.java
View File

@ -48,44 +48,60 @@ public class WeighInfo implements Serializable {
private java.lang.String receivingUnit ; private java.lang.String receivingUnit ;
/**货名*/ /**货名*/
@Excel(name = "货名", width = 15) @Excel(name = "货名", width = 15)
@ApiModelProperty(value="货名") @ApiModelProperty(value = "货名")
private java.lang.String goodsName ; private java.lang.String goodsName;
/**规格*/ /**
* 规格
*/
@Excel(name = "规格", width = 15) @Excel(name = "规格", width = 15)
@ApiModelProperty(value="规格") @ApiModelProperty(value = "规格")
private java.lang.String specifications ; private java.lang.String specifications;
/**备注*/ /**
* 备注
*/
@Excel(name = "备注", width = 15) @Excel(name = "备注", width = 15)
@ApiModelProperty(value="备注") @ApiModelProperty(value = "备注")
private java.lang.String reserve ; private java.lang.String reserve;
/**毛重*/ /**
@Excel(name = "毛重", width = 15) * 皮重
@ApiModelProperty(value="毛重") */
private java.math.BigDecimal tare ;
/**皮重*/
@Excel(name = "皮重", width = 15) @Excel(name = "皮重", width = 15)
@ApiModelProperty(value="皮重") @ApiModelProperty(value = "皮重")
private java.math.BigDecimal grossWeight ; private java.math.BigDecimal tare;
/**净重*/ /**
* 毛重
*/
@Excel(name = "毛重", width = 15)
@ApiModelProperty(value = "毛重")
private java.math.BigDecimal grossWeight;
/**
* 净重
*/
@Excel(name = "净重", width = 15) @Excel(name = "净重", width = 15)
@ApiModelProperty(value="净重") @ApiModelProperty(value = "净重")
private java.math.BigDecimal netWeight ; private java.math.BigDecimal netWeight;
/**皮重时间*/ /**
@Excel(name = "皮重时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") * 毛重时间
@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 grossTime ;
/**毛重时间*/
@Excel(name = "毛重时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @Excel(name = "毛重时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value="毛重时间") @ApiModelProperty(value = "毛重时间")
private java.util.Date tareTime ; private java.util.Date grossTime;
/**一磅时间*/ /**
* 皮重时间
*/
@Excel(name = "皮重时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@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 tareTime;
/**
* 一磅时间
*/
@Excel(name = "一磅时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @Excel(name = "一磅时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value="一磅时间") @ApiModelProperty(value="一磅时间")
private java.util.Date aCheckTime ; private java.util.Date aCheckTime ;
/** /**

3
src/main/java/com/zhgd/xmgl/modules/weight/mapper/WeighBookVehicleInfoMapper.java
View File

@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.xmgl.modules.weight.entity.WeighBookVehicleInfo; import com.zhgd.xmgl.modules.weight.entity.WeighBookVehicleInfo;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import java.util.HashMap; import java.util.HashMap;
@ -17,5 +18,5 @@ import java.util.HashMap;
@Mapper @Mapper
public interface WeighBookVehicleInfoMapper extends BaseMapper<WeighBookVehicleInfo> { public interface WeighBookVehicleInfoMapper extends BaseMapper<WeighBookVehicleInfo> {
IPage<WeighBookVehicleInfo> getByLastPullTime(HashMap<String, String> map, Page<WeighBookVehicleInfo> page); IPage<WeighBookVehicleInfo> getByLastPullTime(@Param("p") HashMap<String, String> map, Page<WeighBookVehicleInfo> page);
} }

4
src/main/java/com/zhgd/xmgl/modules/weight/mapper/xml/WeighBookVehicleInfoMapper.xml
View File

@ -4,7 +4,7 @@
<select id="getByLastPullTime" resultType="com.zhgd.xmgl.modules.weight.entity.WeighBookVehicleInfo"> <select id="getByLastPullTime" resultType="com.zhgd.xmgl.modules.weight.entity.WeighBookVehicleInfo">
select * select *
from weigh_book_vehicle_info vi from weigh_book_vehicle_info vi
where vi.project_sn = #{projectSn} where vi.project_sn = #{p.projectSn}
and vi.update_time <![CDATA[>=]]> #{lastPullTime} and vi.update_time <![CDATA[>=]]> #{p.lastPullTime}
</select> </select>
</mapper> </mapper>

160
src/main/resources/application.properties
View File

@ -1,4 +1,4 @@
# 环境选择 # \u73AF\u5883\u9009\u62E9
spring.profiles.active=zjsj-gsx spring.profiles.active=zjsj-gsx
#spring.profiles.active=dev6024 #spring.profiles.active=dev6024
#spring.profiles.active=dev6025 #spring.profiles.active=dev6025
@ -21,94 +21,94 @@ spring.profiles.active=zjsj-gsx
#spring.profiles.active=zjyj #spring.profiles.active=zjyj
#spring.profiles.active=hqhf #spring.profiles.active=hqhf
#spring.profiles.active=prod #spring.profiles.active=prod
# 国际化配置 # \u56FD\u9645\u5316\u914D\u7F6E
spring.messages.basename=i18n/messages spring.messages.basename=i18n/messages
spring.messages.encoding=utf-8 spring.messages.encoding=utf-8
# 后发现的bean会覆盖之前相同名称的bean # \u540E\u53D1\u73B0\u7684bean\u4F1A\u8986\u76D6\u4E4B\u524D\u76F8\u540C\u540D\u79F0\u7684bean
spring.main.allow-bean-definition-overriding=true spring.main.allow-bean-definition-overriding=true
# 数据库驱动类 # \u6570\u636E\u5E93\u9A71\u52A8\u7C7B
spring.datasource.driver-class-name=com.mysql.jdbc.driver spring.datasource.driver-class-name=com.mysql.jdbc.Driver
#spring.datasource.driver-class-name=com.mysql.cj.jdbc.driver #spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
# 数据库连接池配置 # \u6570\u636E\u5E93\u8FDE\u63A5\u6C60\u914D\u7F6E
spring.datasource.type=com.zaxxer.hikari.hikaridatasource spring.datasource.type=com.zaxxer.hikari.HikariDataSource
spring.datasource.hikari.minimum-idle=20 spring.datasource.hikari.minimum-idle=20
spring.datasource.hikari.maximum-pool-size=500 spring.datasource.hikari.maximum-pool-size=500
spring.datasource.hikari.auto-commit=true spring.datasource.hikari.auto-commit=true
spring.datasource.hikari.idle-timeout=40000 spring.datasource.hikari.idle-timeout=40000
spring.datasource.hikari.pool-name=datebookhikaricp spring.datasource.hikari.pool-name=DatebookHikariCP
spring.datasource.hikari.max-lifetime=1800000 spring.datasource.hikari.max-lifetime=1800000
spring.datasource.hikari.validation-timeout=3000 spring.datasource.hikari.validation-timeout=3000
#(wait_timeout-30)*1000 #(wait_timeout-30)*1000
spring.datasource.hikari.connection-timeout=50000 spring.datasource.hikari.connection-timeout=50000
spring.datasource.hikari.connection-test-query=select 1 spring.datasource.hikari.connection-test-query=SELECT 1
# 数据库加密签名 # \u6570\u636E\u5E93\u52A0\u5BC6\u7B7E\u540D
jasypt.encryptor.password=jxjzhgdpt jasypt.encryptor.password=JXJZHGDPT
# 如果查询结果中包含空值的列，则 mybatis 在映射的时候，会不会映射这个字段 # \u5982\u679C\u67E5\u8BE2\u7ED3\u679C\u4E2D\u5305\u542B\u7A7A\u503C\u7684\u5217\uFF0C\u5219 MyBatis \u5728\u6620\u5C04\u7684\u65F6\u5019\uFF0C\u4F1A\u4E0D\u4F1A\u6620\u5C04\u8FD9\u4E2A\u5B57\u6BB5
mybatis-plus.configuration.call-setters-on-nulls=true mybatis-plus.configuration.call-setters-on-nulls=true
# 序列化配置 # \u5E8F\u5217\u5316\u914D\u7F6E
spring.jackson.defaultpropertyinclusion=always spring.jackson.defaultPropertyInclusion=ALWAYS
# mybatis 配置 # mybatis \u914D\u7F6E
mybatis-plus.mapper-locations=classpath*:com/zhgd/xmgl/**/*.xml,classpath*:com/zhwl/zw/**/*.xml mybatis-plus.mapper-locations=classpath*:com/zhgd/xmgl/**/*.xml,classpath*:com/zhwl/zw/**/*.xml
mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.stdoutimpl mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
# 全局逻辑删除的实体字段名(since 3.3.0,配置后可以忽略不配置步骤2) # 全局逻辑删除的实体字段名(since 3.3.0,配置后可以忽略不配置步骤2)
#mybatis-plus.global-config.db-config.logic-delete-field=flag #mybatis-plus.global-config.db-config.logic-delete-field=flag
mybatis-plus.global-config.db-config.logic-delete-value=1 mybatis-plus.global-config.db-config.logic-delete-value=1
mybatis-plus.global-config.db-config.logic-not-delete-value=0 mybatis-plus.global-config.db-config.logic-not-delete-value=0
# mvc 视图对象配置 # mvc \u89C6\u56FE\u5BF9\u8C61\u914D\u7F6E
spring.mvc.view.prefix=/ spring.mvc.view.prefix=/
spring.mvc.view.suffix=.html spring.mvc.view.suffix=.html
spring.mvc.dispatch-options-request=true spring.mvc.dispatch-options-request=true
# jwt签名 # jwt\u7B7E\u540D
security.jwt.token.secret-key=zhgd security.jwt.token.secret-key=zhgd
# 文件上传配置 # \u6587\u4EF6\u4E0A\u4F20\u914D\u7F6E
spring.servlet.multipart.enabled=true spring.servlet.multipart.enabled=true
spring.servlet.multipart.file-size-threshold=0 spring.servlet.multipart.file-size-threshold=0
spring.servlet.multipart.max-file-size=1024mb spring.servlet.multipart.max-file-size=1024MB
spring.servlet.multipart.max-request-size=1024mb spring.servlet.multipart.max-request-size=1024MB
spring.servlet.multipart.resolve-lazily=false spring.servlet.multipart.resolve-lazily=false
# mqtt服务器配置 # mqtt\u670D\u52A1\u5668\u914D\u7F6E
mqtt.username=admin mqtt.username=admin
mqtt.password=public mqtt.password=public
#mqtt.url=tcp://139.159.226.224:1883 #mqtt.url=tcp://139.159.226.224:1883
#mqtt.url=ws://139.159.226.224:8083/mqtt #mqtt.url=ws://139.159.226.224:8083/mqtt
mqtt.url=tcp://182.90.224.147:1883 mqtt.url=tcp://182.90.224.147:1883
# 消费者和提供者对应的客户端id以及默认topic # \u6D88\u8D39\u8005\u548C\u63D0\u4F9B\u8005\u5BF9\u5E94\u7684\u5BA2\u6237\u7AEFid\u4EE5\u53CA\u9ED8\u8BA4topic
mqtt.producer.clientid=mqttprod mqtt.producer.clientId=mqttProd
mqtt.producer.defaulttopic=topic1 mqtt.producer.defaultTopic=topic1
mqtt.consumer.clientid=mqttconsumer mqtt.consumer.clientId=mqttConsumer
mqtt.consumer.defaulttopic=topic1 mqtt.consumer.defaultTopic=topic1
#mqtt.consumer.defaulttopic=/p114101/202203010084 #mqtt.consumer.defaultTopic=/P114101/202203010084
#server.http2.enabled=true #server.http2.enabled=true
server.ssl.key-store=classpath:www.cscec1b1.com.jks server.ssl.key-store=classpath:www.cscec1b1.com.jks
server.ssl.key-store-password=un8&yp!o^nyd*gm# server.ssl.key-store-password=Un8&yP!o^Nyd*gm#
server.ssl.key-store-type=jks server.ssl.key-store-type=JKS
server.ssl.enabled=true server.ssl.enabled=true
image.visit.url= image.visit.url=
# 华为云配置 # \u534E\u4E3A\u4E91\u914D\u7F6E
hw-ocr-username=szjxjzh hw-ocr-username=szjxjzh
hw-ocr-password=jxj27696951 hw-ocr-password=jxj27696951
hw-ocr-domainname=szjxjzh hw-ocr-domainname=szjxjzh
hw-ocr-projectid=0633b705cc000f3e2f55c010af021eec hw-ocr-projectid=0633b705cc000f3e2f55c010af021eec
hw-ocr-endpoint=cn-east-3 hw-ocr-endpoint=cn-east-3
hw-ocr-enable=false hw-ocr-enable=false
# 虹软配置 # \u8679\u8F6F\u914D\u7F6E
arcsoft.appid=4f9jmkscyksqskybtxk7sqzlh8dfdt7lk5yjx5xa8gkb arcsoft.appId=4F9jmKsCYKsQskYBTXK7sQZLH8dFdT7LK5Yjx5XA8gkB
arcsoft.sdkkey=fuphppfpxramfrecmcsig5bjmhswp86qogvdcm7g8b5k arcsoft.sdkKey=FUPhPPfPXrAmFrecmCSiG5BjmHSwp86QogvdCM7g8B5k
arcsoft.linux.sdkkey=fuphppfpxramfrecmcsig5bjdaskgrsejygzuuvj4f6v arcsoft.linux.sdkKey=FUPhPPfPXrAmFrecmCSiG5BjdAskGRSejyGzUuVj4F6V
arcsoft.ufacesorce=80 arcsoft.ufaceSorce=80
# 授权校验 # \u6388\u6743\u6821\u9A8C
checkauthenable=false checkAuthEnable=false
# 华为云短信服务配置 # \u534E\u4E3A\u4E91\u77ED\u4FE1\u670D\u52A1\u914D\u7F6E
sms.hw.appkey=jxu82mbx1x4l4rc78ynn1d9q3nei sms.hw.appKey=JxU82mBx1x4l4RC78ynN1D9Q3neI
sms.hw.appsecret=c9wi20z1z5n1yz2t6uh2bjutuaf4 sms.hw.appSecret=c9wi20z1z5N1YZ2T6UH2BJuTUAF4
sms.hw.verify.signchannel=88200413256 sms.hw.verify.signchannel=88200413256
sms.hw.verify.verifycode=f273233ff3224adbbbc85cd53d58fc50 sms.hw.verify.verifyCode=f273233ff3224adbbbc85cd53d58fc50
sms.hw.notice.signchannel=8821051731025 sms.hw.notice.signchannel=8821051731025
sms.hw.notice.templateid.standardalarm=790d907f70594b4893227fc1d97e78bc sms.hw.notice.templateId.standardAlarm=790d907f70594b4893227fc1d97e78bc
sms.hw.notice.templateid.standarddevstate=10930770f5954d12881143e548f8483b sms.hw.notice.templateId.standardDevState=10930770f5954d12881143e548f8483b
sms.hw.notice.templateid.carpass= sms.hw.notice.templateId.carPass=
swagger.enable=true swagger.enable=true
# redis集群 # redis\u96C6\u7FA4
#spring.redis.database=0 #spring.redis.database=0
#spring.redis.cluster.nodes=127.0.0.1:6379,192.168.40.156:6380 #spring.redis.cluster.nodes=127.0.0.1:6379,192.168.40.156:6380
#spring.redis.cluster.max-redirects=3 #spring.redis.cluster.max-redirects=3
@ -117,56 +117,56 @@ swagger.enable=true
#spring.redis.lettuce.pool.max-wait=60s #spring.redis.lettuce.pool.max-wait=60s
#spring.redis.lettuce.pool.max-idle=10 #spring.redis.lettuce.pool.max-idle=10
#spring.redis.lettuce.pool.min-idle=5 #spring.redis.lettuce.pool.min-idle=5
#个推配置 #\u4E2A\u63A8\u914D\u7F6E
getui.baseurl=https://restapi.getui.com/v2/ getui.baseUrl=https://restapi.getui.com/v2/
# 新配置 # \u65B0\u914D\u7F6E
getui.appid=vtqrdzrpei8snxkdawstz3 getui.appId=vTqRdzRpeI8SnXKDawStZ3
getui.appkey=wlpjaki13r8stuofcjnxm1 getui.appKey=wlPjAki13R8STuofcjnXM1
getui.appsecret=wy3ffyaxzb9mul94fmrlo1 getui.appSecret=Wy3FFyaXzb9MUl94FMrLo1
getui.mastersecret=zz5bmtojue5v3mfhm8gll getui.masterSecret=zZ5bMTOjUe5v3MFhm8gLL
#判断考勤回调是否需要图片,1是 #\u5224\u65AD\u8003\u52E4\u56DE\u8C03\u662F\u5426\u9700\u8981\u56FE\u7247,1\u662F
# 人员考勤图片类型 1：base64 # \u4EBA\u5458\u8003\u52E4\u56FE\u7247\u7C7B\u578B 1\uFF1Abase64
imagetype=1 imageType=1
# jxj设备图片类型 # jxj\u8BBE\u5907\u56FE\u7247\u7C7B\u578B
jxj.dev.image.type=1 jxj.dev.image.type=1
pdf.watermark=实名制 pdf.watermark=\u5B9E\u540D\u5236
# bimface请求url # bimface\u8BF7\u6C42URL
bim.gettokenurl=https://api.bimface.com/oauth2/token bim.getTokenURL=https://api.bimface.com/oauth2/token
bim.deletefileurl=https://file.bimface.com/file?fileid=%s bim.deleteFileURL=https://file.bimface.com/file?fileId=%s
bim.uploadurl=https://file.bimface.com/upload?name=%s&url=%s bim.uploadURL=https://file.bimface.com/upload?name=%s&url=%s
# redis 单体配置 # redis \u5355\u4F53\u914D\u7F6E
spring.redis.database=1 spring.redis.database=1
spring.redis.host=127.0.0.1 spring.redis.host=127.0.0.1
spring.redis.port=6379 spring.redis.port=6379
#spring.redis.password=jxj@admin #spring.redis.password=JXJ@admin
spring.redis.password= spring.redis.password=
spring.redis.timeout=2000s spring.redis.timeout=2000s
spring.redis.lettuce.pool.max-active=8 spring.redis.lettuce.pool.max-active=8
spring.redis.lettuce.pool.max-wait=60s spring.redis.lettuce.pool.max-wait=60s
spring.redis.lettuce.pool.max-idle=10 spring.redis.lettuce.pool.max-idle=10
spring.redis.lettuce.pool.min-idle=10 spring.redis.lettuce.pool.min-idle=10
# spring boot admin 所在服务器 # spring boot admin \u6240\u5728\u670D\u52A1\u5668
spring.boot.admin.client.url=http://localhost:9091 spring.boot.admin.client.url=http://localhost:9091
# actuator 配置内容 # actuator \u914D\u7F6E\u5185\u5BB9
management.endpoints.web.exposure.include=* management.endpoints.web.exposure.include=*
management.endpoints.enabled-by-default=true management.endpoints.enabled-by-default=true
management.endpoints.web.base-path=/actuator management.endpoints.web.base-path=/actuator
management.endpoint.health.show-details=always management.endpoint.health.show-details=always
management.endpoint.logfile.external-file=logs/logs/zhgd-all.log management.endpoint.logfile.external-file=logs/logs/zhgd-all.log
# 携稳电箱获取最后一条数据 # \u643A\u7A33\u7535\u7BB1\u83B7\u53D6\u6700\u540E\u4E00\u6761\u6570\u636E
xiwon.postelectricrealtimedata=http://openapi.xiwon588.com/electric/realtimedata xiwon.postElectricRealTimeData=http://openapi.xiwon588.com/electric/realTimeData
# 携稳密钥 # \u643A\u7A33\u5BC6\u94A5
#xiwon.appid=1638947489842 #xiwon.appId=1638947489842
#xiwon.appsecret=36e0a5cf-02e6-421b-bf92-3b1ace11e1a2 #xiwon.appSecret=36e0a5cf-02e6-421b-bf92-3b1ace11e1a2
# 正式 # \u6B63\u5F0F
xiwon.appid=1672383573694 xiwon.appId=1672383573694
xiwon.appsecret=5dfe1664-51fd-40af-8fbb-a15bbcaae1d1 xiwon.appSecret=5dfe1664-51fd-40af-8fbb-a15bbcaae1d1
# 光伏发电客户信息 # \u5149\u4F0F\u53D1\u7535\u5BA2\u6237\u4FE1\u606F
koyoe.clientid=btxny koyoe.clientId=btxny
koyoe.secret=akdu5sar7w koyoe.secret=akdu5sar7w
# 光伏发电请求地址 # \u5149\u4F0F\u53D1\u7535\u8BF7\u6C42\u5730\u5740
koyoe.base-url=https://solar.koyoe.com koyoe.base-url=https://solar.koyoe.com
koyoe.get-token=${koyoe.base-url}/third-party/api/token?grant_type=client_credentials koyoe.get-token=${koyoe.base-url}/third-party/api/token?grant_type=client_credentials
koyoe.nowdata=${koyoe.base-url}/third-party/api/nowdata?sn=%s koyoe.nowData=${koyoe.base-url}/third-party/api/nowData?sn=%s
# 是否证书验证 # \u662F\u5426\u8BC1\u4E66\u9A8C\u8BC1
is-license=false is-license=false