Commit db30b97e authored by 竹天卫's avatar 竹天卫
parents ff4939e8 7e3f6dc6
...@@ -38,12 +38,10 @@ ...@@ -38,12 +38,10 @@
<dependency> <dependency>
<groupId>org.redisson</groupId> <groupId>org.redisson</groupId>
<artifactId>redisson</artifactId> <artifactId>redisson</artifactId>
<version>3.11.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>redis.clients</groupId> <groupId>redis.clients</groupId>
<artifactId>jedis</artifactId> <artifactId>jedis</artifactId>
<version>3.1.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
...@@ -68,7 +66,6 @@ ...@@ -68,7 +66,6 @@
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<!--<version>5.1.45</version>--> <!--<version>5.1.45</version>-->
<version>8.0.18</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
...@@ -99,7 +96,6 @@ ...@@ -99,7 +96,6 @@
<dependency> <dependency>
<groupId>cn.hutool</groupId> <groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId> <artifactId>hutool-all</artifactId>
<version>4.6.8</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/org.freemarker/freemarker --> <!-- https://mvnrepository.com/artifact/org.freemarker/freemarker -->
<dependency> <dependency>
...@@ -110,28 +106,28 @@ ...@@ -110,28 +106,28 @@
<dependency> <dependency>
<groupId>io.jsonwebtoken</groupId> <groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId> <artifactId>jjwt</artifactId>
<version>0.9.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>23.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.poi</groupId> <groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId> <artifactId>poi</artifactId>
<version>3.17</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/net.oschina.zcx7878/fastdfs-client-java --> <!-- https://mvnrepository.com/artifact/net.oschina.zcx7878/fastdfs-client-java -->
<dependency> <dependency>
<groupId>net.oschina.zcx7878</groupId> <groupId>net.oschina.zcx7878</groupId>
<artifactId>fastdfs-client-java</artifactId> <artifactId>fastdfs-client-java</artifactId>
<version>1.27.0.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<version>2.6</version> </dependency>
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>core</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
......
package cn.wise.sc.cement.business.controller;
import cn.wise.sc.cement.business.entity.Cabinet;
import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.service.ICabinetService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 前端控制器
* </p>
*
* @author ztw
* @since 2020-10-19
*/
@Api(tags = "存储柜子管理")
@RestController
@RequestMapping("/business/cabinet")
public class CabinetController {
final
ICabinetService iCabinetService;
public CabinetController(ICabinetService iCabinetService) {
this.iCabinetService = iCabinetService;
}
@PostMapping("/new")
@ApiOperation("新增柜子")
public BaseResponse<Boolean> newCabinet(@RequestBody Cabinet cabinet) {
boolean save = iCabinetService.save(cabinet);
if (save) {
return BaseResponse.okData(true);
} else {
return BaseResponse.errorMsg("添加失败!");
}
}
@PutMapping("/edit")
@ApiOperation("编辑柜子")
public BaseResponse<Boolean> editCabinet(@RequestBody Cabinet cabinet) {
boolean b = iCabinetService.updateById(cabinet);
if (b) {
return BaseResponse.okData(true);
} else {
return BaseResponse.errorMsg("更新失败失败!");
}
}
@GetMapping("/page")
@ApiOperation("查询柜子分页")
public BaseResponse<IPage<Cabinet>> page(PageQuery pageQuery) {
IPage<Cabinet> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
return BaseResponse.okData(iCabinetService.page(page));
}
}
package cn.wise.sc.cement.business.controller; package cn.wise.sc.cement.business.controller;
import cn.hutool.core.codec.Base64;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.qrcode.QrCodeUtil;
import cn.wise.sc.cement.business.model.BaseResponse; import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.PageQuery; import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.query.SampleManageQuery; import cn.wise.sc.cement.business.model.query.SampleManageQuery;
import cn.wise.sc.cement.business.model.query.StandardQuery;
import cn.wise.sc.cement.business.service.ISampleService; import cn.wise.sc.cement.business.service.ISampleService;
import cn.wise.sc.cement.business.service.ISysDictionaryService; import cn.wise.sc.cement.business.service.ISysDictionaryService;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
...@@ -16,7 +19,14 @@ import org.slf4j.LoggerFactory; ...@@ -16,7 +19,14 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.imageio.ImageIO;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
/** /**
* <p> * <p>
...@@ -26,7 +36,7 @@ import javax.servlet.http.HttpServletResponse; ...@@ -26,7 +36,7 @@ import javax.servlet.http.HttpServletResponse;
* @author ztw * @author ztw
* @since 2020-09-04 * @since 2020-09-04
*/ */
@Api(tags="样品管理") @Api(tags = "样品管理")
@RestController @RestController
@RequestMapping("/business/sample") @RequestMapping("/business/sample")
public class SampleController { public class SampleController {
...@@ -65,16 +75,13 @@ public class SampleController { ...@@ -65,16 +75,13 @@ public class SampleController {
} }
} }
@ApiOperation(value = "样品详情") @ApiOperation(value = "样品详情")
@GetMapping("/{id}") @GetMapping("/{id}")
public BaseResponse getById(@PathVariable Integer id){ public BaseResponse getById(@PathVariable Integer id) {
try { try {
return sampleService.getDetail(id); return sampleService.getDetail(id);
}catch (Exception e){ } catch (Exception e) {
log.debug("样品详情{}",e); log.debug("样品详情{}", e);
} }
return BaseResponse.errorMsg("失败!"); return BaseResponse.errorMsg("失败!");
} }
...@@ -84,35 +91,88 @@ public class SampleController { ...@@ -84,35 +91,88 @@ public class SampleController {
public BaseResponse register(@RequestBody SampleManageQuery query) { public BaseResponse register(@RequestBody SampleManageQuery query) {
try { try {
return sampleService.register(query); return sampleService.register(query);
}catch (Exception e) { } catch (Exception e) {
log.debug("样品登记{}",e); log.debug("样品登记{}", e);
} }
return BaseResponse.errorMsg("失败!"); return BaseResponse.errorMsg("失败!");
} }
@ApiOperation("绑定样品信息")
@PutMapping("/bind/savePosition")
public BaseResponse<String> bindSavePosition(@RequestBody SampleManageQuery query) {
try {
return sampleService.bindSavePosition(query);
} catch (Exception e) {
log.debug("样品登记{}", e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation("样品复查")
@PutMapping("/review")
public BaseResponse<Boolean> ampleReview(Integer id) {
return sampleService.ampleReview(id);
}
@ApiOperation("获取存储位置二维码")
@PostMapping("/saverq/init")
public BaseResponse<List<String>> getSaveRQ(@RequestBody List<String> savePositions) throws IOException {
if (CollectionUtil.isEmpty(savePositions)) {
log.error("生成存储位置二维码失败!savePosition参数为空!");
}
ByteArrayOutputStream stream = new ByteArrayOutputStream();
List<String> rts = new ArrayList<>(savePositions.size());
for (String savePosition : savePositions) {
stream.reset();
BufferedImage bufferedImage = QrCodeUtil.generate(savePosition, 200, 200);
ImageIO.write(bufferedImage, "png", stream);
String base64 = Base64.encode(stream.toByteArray());
rts.add(base64);
System.out.println(base64);
}
stream.close();
return BaseResponse.okData(rts);
}
@ApiOperation("获取样品二维码")
@PostMapping("/samplerq/init")
public BaseResponse<String> getSampleRQ(String sampleId) throws IOException {
if (StrUtil.isBlank(sampleId)) {
log.error("生成样品二维码失败!savePosition参数为空!");
}
ByteArrayOutputStream stream = new ByteArrayOutputStream();
BufferedImage bufferedImage = QrCodeUtil.generate(sampleId, 200, 200);
ImageIO.write(bufferedImage, "png", stream);
stream.close();
return BaseResponse.okData(Base64.encode(stream.toByteArray()));
}
@ApiOperation(value = "样品销毁") @ApiOperation(value = "样品销毁")
@PostMapping("/destruction/{id}") @PostMapping("/destruction/{id}")
public BaseResponse destruction(@PathVariable Integer id) { public BaseResponse destruction(@PathVariable Integer id) {
try { try {
return sampleService.destruction(id); return sampleService.destruction(id);
}catch (Exception e) { } catch (Exception e) {
log.debug("样品销毁{}",e); log.debug("样品销毁{}", e);
} }
return BaseResponse.errorMsg("失败!"); return BaseResponse.errorMsg("失败!");
} }
@ApiOperation(value = "获取样品状态列表") @ApiOperation(value = "获取样品状态列表")
@GetMapping("/getSampleFormList") @GetMapping("/getSampleFormList")
public BaseResponse getSampleFormList(){ public BaseResponse getSampleFormList() {
try { try {
return dictionaryService.getContent("样品状态"); return dictionaryService.getContent("样品状态");
}catch (Exception e){ } catch (Exception e) {
log.debug("获取样品状态列表{}",e); log.debug("获取样品状态列表{}", e);
} }
return BaseResponse.errorMsg("失败!"); return BaseResponse.errorMsg("失败!");
} }
} }
package cn.wise.sc.cement.business.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
*
* </p>
*
* @author ztw
* @since 2020-10-19
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class Cabinet implements Serializable {
private static final long serialVersionUID=1L;
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
private String name;
}
...@@ -3,11 +3,9 @@ package cn.wise.sc.cement.business.entity; ...@@ -3,11 +3,9 @@ package cn.wise.sc.cement.business.entity;
import java.math.BigDecimal; import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.io.Serializable; import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
...@@ -98,7 +96,7 @@ public class Sample implements Serializable { ...@@ -98,7 +96,7 @@ public class Sample implements Serializable {
@ApiModelProperty("原样位置") @ApiModelProperty("原样位置")
private String originalPosition; private String originalPosition;
@ApiModelProperty("(0未领用,1已领用,2已销毁)") @ApiModelProperty("(0未领用,1已领用,2已销毁,3复查)")
private Integer status; private Integer status;
@ApiModelProperty("销毁时间") @ApiModelProperty("销毁时间")
...@@ -112,6 +110,4 @@ public class Sample implements Serializable { ...@@ -112,6 +110,4 @@ public class Sample implements Serializable {
@ApiModelProperty("样品是否校核完成(0未检测完成, 1检测完成,)") @ApiModelProperty("样品是否校核完成(0未检测完成, 1检测完成,)")
private Integer isCheck; private Integer isCheck;
} }
package cn.wise.sc.cement.business.mapper;
import cn.wise.sc.cement.business.entity.Cabinet;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* Mapper 接口
* </p>
*
* @author ztw
* @since 2020-10-19
*/
public interface CabinetMapper extends BaseMapper<Cabinet> {
}
<?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="cn.wise.sc.cement.business.mapper.CabinetMapper">
</mapper>
package cn.wise.sc.cement.business.model.query; package cn.wise.sc.cement.business.model.query;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.mysql.cj.xdevapi.JsonArray;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Map; import java.util.Map;
/** /**
......
package cn.wise.sc.cement.business.service;
import cn.wise.sc.cement.business.entity.Cabinet;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 服务类
* </p>
*
* @author ztw
* @since 2020-10-19
*/
public interface ICabinetService extends IService<Cabinet> {
}
...@@ -31,4 +31,17 @@ public interface ISampleService extends IService<Sample> { ...@@ -31,4 +31,17 @@ public interface ISampleService extends IService<Sample> {
void export(String sampleName, String cementCode, void export(String sampleName, String cementCode,
String fileName, HttpServletResponse response); String fileName, HttpServletResponse response);
/**
* 绑定位置信息
* @param query 小样绑定位置信息
* @return 成功与否
*/
BaseResponse<String> bindSavePosition(SampleManageQuery query);
/**
* 样品复查
* @param id 样品id
* @return 复查成功与否
*/
BaseResponse<Boolean> ampleReview(Integer id);
} }
package cn.wise.sc.cement.business.service.impl;
import cn.wise.sc.cement.business.entity.Cabinet;
import cn.wise.sc.cement.business.mapper.CabinetMapper;
import cn.wise.sc.cement.business.service.ICabinetService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 服务实现类
* </p>
*
* @author ztw
* @since 2020-10-19
*/
@Service
public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> implements ICabinetService {
}
...@@ -269,8 +269,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl ...@@ -269,8 +269,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
} }
} }
if(teamNameList.contains("Al2O3")){ if(teamNameList.contains("Al2O3")){
if(!teamNameList.contains("Fe2O3")){ if(!teamNameList.contains("Fe2o3")){
return BaseResponse.errorMsg("选择Al2O3必须要选择Fe2O3"); return BaseResponse.errorMsg("选择Al2O3必须要选择Fe2o3");
} }
} }
} }
......
package cn.wise.sc.cement.business.service.impl; package cn.wise.sc.cement.business.service.impl;
import cn.wise.sc.cement.business.entity.Method;
import cn.wise.sc.cement.business.entity.Sample; import cn.wise.sc.cement.business.entity.Sample;
import cn.wise.sc.cement.business.entity.SampleTmp;
import cn.wise.sc.cement.business.entity.Team;
import cn.wise.sc.cement.business.mapper.SampleMapper; import cn.wise.sc.cement.business.mapper.SampleMapper;
import cn.wise.sc.cement.business.model.BaseResponse; import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.PageQuery; import cn.wise.sc.cement.business.model.PageQuery;
...@@ -12,7 +9,6 @@ import cn.wise.sc.cement.business.model.vo.SampleVo; ...@@ -12,7 +9,6 @@ import cn.wise.sc.cement.business.model.vo.SampleVo;
import cn.wise.sc.cement.business.service.ISampleService; import cn.wise.sc.cement.business.service.ISampleService;
import cn.wise.sc.cement.business.service.ISysUserService; import cn.wise.sc.cement.business.service.ISysUserService;
import cn.wise.sc.cement.business.util.ExcelUtil; import cn.wise.sc.cement.business.util.ExcelUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
...@@ -23,6 +19,7 @@ import org.springframework.transaction.annotation.Transactional; ...@@ -23,6 +19,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
...@@ -42,20 +39,22 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme ...@@ -42,20 +39,22 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
@Resource @Resource
private SampleMapper sampleMapper; private SampleMapper sampleMapper;
@Autowired private final ISysUserService userService;
private ISysUserService userService;
public SampleServiceImpl(ISysUserService userService) {
this.userService = userService;
}
/** /**
* 分页列表 * 分页列表
*
* @param pageQuery * @param pageQuery
* @param sampleName * @param sampleName
* @param cementCode * @param cementCode
* @return * @return
*/ */
@Override @Override
public BaseResponse<IPage<SampleVo>> getPage(PageQuery pageQuery, String sampleName, String cementCode){ public BaseResponse<IPage<SampleVo>> getPage(PageQuery pageQuery, String sampleName, String cementCode) {
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
params.put("sampleName", sampleName); params.put("sampleName", sampleName);
params.put("cementCode", cementCode); params.put("cementCode", cementCode);
...@@ -66,13 +65,14 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme ...@@ -66,13 +65,14 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
/** /**
* 样品管理详情 * 样品管理详情
*
* @param id * @param id
* @return * @return
*/ */
@Override @Override
public BaseResponse<SampleVo> getDetail(Integer id){ public BaseResponse<SampleVo> getDetail(Integer id) {
SampleVo sampleVo = sampleMapper.getDetail(id); SampleVo sampleVo = sampleMapper.getDetail(id);
if(sampleVo == null ){ if (sampleVo == null) {
return BaseResponse.errorMsg("信息错误!"); return BaseResponse.errorMsg("信息错误!");
} }
return BaseResponse.okData(sampleVo); return BaseResponse.okData(sampleVo);
...@@ -80,6 +80,7 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme ...@@ -80,6 +80,7 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
/** /**
* 样品登记 * 样品登记
*
* @param query * @param query
* @return * @return
*/ */
...@@ -90,7 +91,7 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme ...@@ -90,7 +91,7 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
return BaseResponse.errorMsg("参数错误!"); return BaseResponse.errorMsg("参数错误!");
} }
Sample sample = sampleMapper.selectById(query.getId()); Sample sample = sampleMapper.selectById(query.getId());
if(sample == null){ if (sample == null) {
return BaseResponse.errorMsg("信息错误"); return BaseResponse.errorMsg("信息错误");
} }
sample.setOperatorId(userService.getLoginUser().getId()) sample.setOperatorId(userService.getLoginUser().getId())
...@@ -115,7 +116,7 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme ...@@ -115,7 +116,7 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
return BaseResponse.errorMsg("参数错误!"); return BaseResponse.errorMsg("参数错误!");
} }
Sample sample = sampleMapper.selectById(id); Sample sample = sampleMapper.selectById(id);
if(sample == null){ if (sample == null) {
return BaseResponse.errorMsg("信息错误"); return BaseResponse.errorMsg("信息错误");
} }
sample.setStatus(2) sample.setStatus(2)
...@@ -126,6 +127,7 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme ...@@ -126,6 +127,7 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
/** /**
* 样品列表导出 * 样品列表导出
*
* @param sampleName * @param sampleName
* @param cementCode * @param cementCode
* @param fileName * @param fileName
...@@ -169,9 +171,44 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme ...@@ -169,9 +171,44 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
} }
} }
@Override
public BaseResponse<String> bindSavePosition(SampleManageQuery query) {
if (query.getId() == null) {
return BaseResponse.errorMsg("");
}
Sample sample = this.getById(query.getId());
sample.setStatus(1);
sample.setDestructionTime(LocalDateTime.now());
sample.setHandleDate(LocalDate.now());
sample.setLittlePosition(query.getLittlePosition());
sample.setOriginalPosition(query.getOriginalPosition());
boolean b = this.updateById(sample);
if (b){
return BaseResponse.okData("更新成功!");
}else {
return BaseResponse.errorMsg("更新失败,可以重新尝试!");
}
}
@Override
public BaseResponse<Boolean> ampleReview(Integer id) {
if (id == null){
log.debug("样品复查失败!没有指定样品id!");
return BaseResponse.errorMsg("请指定样品id");
}
Sample sample = this.getById(id);
sample.setStatus(3);
boolean b = this.updateById(sample);
if (b){
return BaseResponse.okData(true);
}
return BaseResponse.okData(false);
}
} }
...@@ -5,12 +5,9 @@ import cn.wise.sc.cement.business.mapper.SysDictionaryMapper; ...@@ -5,12 +5,9 @@ import cn.wise.sc.cement.business.mapper.SysDictionaryMapper;
import cn.wise.sc.cement.business.model.BaseResponse; import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.service.ISysDictionaryService; import cn.wise.sc.cement.business.service.ISysDictionaryService;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mysql.cj.xdevapi.JsonArray;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
/** /**
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
<dependency> <dependency>
<groupId>com.baomidou</groupId> <groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-generator</artifactId> <artifactId>mybatis-plus-generator</artifactId>
<version>3.3.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
...@@ -28,7 +27,6 @@ ...@@ -28,7 +27,6 @@
<dependency> <dependency>
<groupId>org.apache.velocity</groupId> <groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId> <artifactId>velocity-engine-core</artifactId>
<version>2.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
......
...@@ -65,10 +65,55 @@ ...@@ -65,10 +65,55 @@
<artifactId>commons-collections4</artifactId> <artifactId>commons-collections4</artifactId>
<version>4.2</version> <version>4.2</version>
</dependency> </dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>4.6.8</version>
</dependency>
<dependency>
<groupId>net.oschina.zcx7878</groupId>
<artifactId>fastdfs-client-java</artifactId>
<version>1.27.0.0</version>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
<version>0.9.0</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>23.0</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>3.17</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.6</version>
</dependency>
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>core</artifactId>
<version>3.3.3</version>
</dependency>
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>5.1.39</version> <version>8.0.18</version>
</dependency>
<dependency>
<groupId>org.redisson</groupId>
<artifactId>redisson</artifactId>
<version>3.11.1</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-generator</artifactId>
<version>3.3.1</version>
</dependency> </dependency>
<!--日志--> <!--日志-->
<dependency> <dependency>
...@@ -77,6 +122,11 @@ ...@@ -77,6 +122,11 @@
<version>2.10.0</version> <version>2.10.0</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>
<version>2.0</version>
</dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId> <artifactId>jul-to-slf4j</artifactId>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment