本所编号 生成规则

检测项组管理

cement-business/src/main/java/cn/wise/sc/cement/business/controller/EntityEnclosureController.java

@@ -35,7 +35,7 @@ import java.util.Map;
 @RequestMapping("/enclosure")
 public class EntityEnclosureController {
 
-	private static final Logger logger = LoggerFactory.getLogger("adminLogger");
+	private static final Logger logger = LoggerFactory.getLogger("EntityEnclosureController");
 
 	@Autowired
 	protected HttpServletResponse response;

cement-business/src/main/java/cn/wise/sc/cement/business/controller/SysGroupController.java

@@ -80,7 +80,7 @@ public class SysGroupController {
 			}
 			return BaseResponse.okData(group);
 		}catch (Exception e){
-			log.debug("角色详情{}",e);
+			log.debug("工作组详情{}",e);
 		}
 		return BaseResponse.errorMsg("失败!");
 	}
@@ -104,7 +104,7 @@ public class SysGroupController {
 			groupService.removeById(id);
 			return BaseResponse.okData("删除成功");
 		}catch (Exception e){
-			log.debug("更新检测方法{}",e);
+			log.debug("删除工作组{}",e);
 		}
 		return BaseResponse.errorMsg("失败!");
 	}

cement-business/src/main/java/cn/wise/sc/cement/business/controller/TeamGroupController.java

+package cn.wise.sc.cement.business.controller;
+
+
+import cn.wise.sc.cement.business.entity.SysGroup;
+import cn.wise.sc.cement.business.entity.TeamGroup;
+import cn.wise.sc.cement.business.model.BaseResponse;
+import cn.wise.sc.cement.business.model.PageQuery;
+import cn.wise.sc.cement.business.service.ITeamGroupService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-09-10
+ */
+@Api(tags="资源管理-检测项组管理")
+@RestController
+@RequestMapping("/business/team-group")
+public class TeamGroupController {
+
+	private static final Logger log = LoggerFactory.getLogger("TeamGroupController");
+
+	@Autowired
+	private ITeamGroupService teamGroupService;
+
+	@ApiOperation(value = "检测项组分页列表")
+	@ApiImplicitParams(value = {
+			@ApiImplicitParam(name = "name", value = "检测项组名称", paramType = "query", dataType = "String")
+	})
+	@GetMapping("/getPage")
+	public BaseResponse getPage(PageQuery pageQuery, String name) {
+		try {
+			return teamGroupService.getPage(pageQuery, name);
+		} catch (Exception e) {
+			log.debug("检测项组分页列表{}", e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+	@ApiOperation(value = "新增检测项组")
+	@PostMapping("/create")
+	public BaseResponse create(@RequestBody TeamGroup query) {
+		try {
+			return teamGroupService.create(query);
+		}catch (Exception e) {
+			log.debug("新增检测项组{}",e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+	@ApiOperation(value = "修改检测项组")
+	@PostMapping("/update")
+	public BaseResponse update(@RequestBody TeamGroup query) {
+		try {
+			return teamGroupService.update(query);
+		}catch (Exception e) {
+			log.debug("修改检测项组{}",e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+	@ApiOperation(value = "检测项组详情")
+	@GetMapping("/{id}")
+	public BaseResponse getById(@PathVariable Integer id){
+		try {
+			TeamGroup group = teamGroupService.getById(id);
+			if(group == null){
+				return BaseResponse.errorMsg("信息错误!");
+			}
+			return BaseResponse.okData(group);
+		}catch (Exception e){
+			log.debug("检测项组详情{}",e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+	@ApiOperation(value = "检测项组列表")
+	@GetMapping("/getList")
+	public BaseResponse getById(){
+		try {
+			List<TeamGroup> list = teamGroupService.list();
+			return BaseResponse.okData(list);
+		}catch (Exception e){
+			log.debug("检测项组列表{}",e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+	@ApiOperation(value = "删除检测项组")
+	@PostMapping("/delete/{id}")
+	public BaseResponse delete(@PathVariable Integer id) {
+		try {
+			teamGroupService.removeById(id);
+			return BaseResponse.okData("删除成功");
+		} catch (Exception e) {
+			log.debug("删除检测项组{}", e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+
+}
+

cement-business/src/main/java/cn/wise/sc/cement/business/entity/Client.java

@@ -12,6 +12,7 @@ import lombok.experimental.Accessors;
 import org.springframework.beans.BeanUtils;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -46,7 +47,11 @@ public class Client extends BaseEntity implements Serializable {
     @ApiModelProperty("状态 0:禁用 1:激活")
     private Integer status;
 
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
 
+    @ApiModelProperty("备注")
+    private String remark;
 
 
 

cement-business/src/main/java/cn/wise/sc/cement/business/entity/TeamGroup.java

+package cn.wise.sc.cement.business.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-09-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TeamGroup implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty("检测项组名称")
+    private String name;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/TeamGroupMapper.java

+package cn.wise.sc.cement.business.mapper;
+
+import cn.wise.sc.cement.business.entity.TeamGroup;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-09-10
+ */
+public interface TeamGroupMapper extends BaseMapper<TeamGroup> {
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/TeamGroupMapper.xml

+<?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.TeamGroupMapper">
+
+</mapper>

cement-business/src/main/java/cn/wise/sc/cement/business/model/query/TeamQuery.java

@@ -22,6 +22,9 @@ public class TeamQuery {
 	@ApiModelProperty("元素分组id")
 	private Integer groupId;
 
+	@ApiModelProperty("元素分组名称")
+	private String groupName;
+
 	@ApiModelProperty("检测依据")
 	private String basis;
 

cement-business/src/main/java/cn/wise/sc/cement/business/service/ITeamGroupService.java

+package cn.wise.sc.cement.business.service;
+
+import cn.wise.sc.cement.business.entity.TeamGroup;
+import cn.wise.sc.cement.business.model.BaseResponse;
+import cn.wise.sc.cement.business.model.PageQuery;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-09-10
+ */
+public interface ITeamGroupService extends IService<TeamGroup> {
+
+	BaseResponse<IPage<TeamGroup>> getPage(PageQuery pageQuery, String name);
+
+	BaseResponse<TeamGroup> create(TeamGroup query);
+
+	BaseResponse<TeamGroup> update(TeamGroup query);
+
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/ClientServiceImpl.java

@@ -27,6 +27,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -78,7 +79,9 @@ public class ClientServiceImpl extends ServiceImpl<ClientMapper, Client> impleme
 	    }
 	    Client create = new Client();
 	    BeanUtils.copyProperties(query, create);
-	    create.setStatus(1);
+	    create.setStatus(1)
+			    .setCreateTime(LocalDateTime.now())
+			    .setRemark(null);
 	    clientMapper.insert(create);
         return BaseResponse.okData(create);
     }

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/CommonServiceImpl.java

@@ -54,7 +54,27 @@ public class CommonServiceImpl {
 		return resultCode;
 	}
 
+	/**
+	 * 获取本所编号的Integer类型
+	 * @param cementCode
+	 * @return
+	 */
+	public Integer getIntegerCode(String cementCode){
+		String[] cementCodes = cementCode.split("-");
+		Integer counts = Integer.parseInt(cementCodes[1]);
+		return counts;
+	}
 
+	/**
+	 * 获取本所编号年份的Integer类型
+	 * @param cementCode
+	 * @return
+	 */
+	public String getIntegerYear(String cementCode){
+		String[] cementCodes = cementCode.split("-");
+		String counts = cementCodes[0];
+		return counts;
+	}
 
 
 

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java

@@ -24,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional;
 import sun.print.BackgroundServiceLookup;
 
 import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.*;
@@ -137,13 +138,11 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 		if(query.getClientId() == null){
 			return BaseResponse.errorMsg("请选择委托单位");
 		}
-
 		if(query.getProjectId() == null || StringUtils.isEmpty(query.getProjectCode())){
 			if(StringUtils.isEmpty(query.getProjectName())){
 				return BaseResponse.errorMsg("请填写项目名称或选择已有项目");
 			}
 		}
-
 		if(StringUtils.isEmpty(query.getSendName()) || StringUtils.isEmpty(query.getSendPhone())){
 			return BaseResponse.errorMsg("请填写送样人信息");
 		}
@@ -279,6 +278,18 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 		}else{
 			maxCementCode = obj.toString();
 		}
+		//校验获取的最大本所编号
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
+		Date date = new Date();
+		String yesrString = sdf.format(date);
+		if(maxCementCode == null){  //如果数据库没有本所编号，初始化本所编号
+			maxCementCode = yesrString +"-000";
+		}else{
+			String yearStr = commonService.getIntegerYear(maxCementCode);
+			if(!yearStr.equals(yesrString)){ //如果数据库本所编号年份和当前不一样，初始化本所编号
+				maxCementCode = yesrString +"-000";
+			}
+		}
 		redisUtil.setString("maxCementCode", maxCementCode);
 		return BaseResponse.okData(maxCementCode);
 	}
@@ -310,8 +321,18 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 				List<Sample> sampleList = new ArrayList<>();
 				QueryWrapper<Sample> sampleQueryWrapper = new QueryWrapper<>();
 				String maxCementCode = ""; //最大本所编号对应的平行样编号
+				Integer integerMaxCode = commonService.getIntegerCode(getMaxCementCode().getData());
 				for(SampleQuery sampleQuery : query.getSampleList()){
-					maxCementCode= sampleQuery.getCementCode();
+					if(StringUtils.isEmpty(sampleQuery.getCementCode())){
+						return BaseResponse.errorMsg("本所编号不能为空");
+					}
+					Integer cementCodeInteger = commonService.getIntegerCode(sampleQuery.getCementCode());
+					if(cementCodeInteger <= integerMaxCode){
+						return BaseResponse.errorMsg("本所编号必须大于最大值");
+					}
+					integerMaxCode = cementCodeInteger>integerMaxCode?cementCodeInteger:integerMaxCode;
+					String yearStr = commonService.getIntegerYear(maxCementCode);
+					maxCementCode= yearStr +"-"+ integerMaxCode;
 					Sample sample = new Sample();
 					BeanUtils.copyProperties(sampleQuery, sample);
 					sample.setId(null)

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/SysGroupServiceImpl.java

@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
@@ -50,6 +51,7 @@ public class SysGroupServiceImpl extends ServiceImpl<SysGroupMapper, SysGroup> i
 	 * @return
 	 */
 	@Override
+	@Transactional
 	public BaseResponse<SysGroup> create(SysGroup query) {
 		if (StringUtils.isEmpty(query.getName())) {
 			return BaseResponse.errorMsg("工作组名称不能为空!");
@@ -72,6 +74,7 @@ public class SysGroupServiceImpl extends ServiceImpl<SysGroupMapper, SysGroup> i
 	 * @return
 	 */
 	@Override
+	@Transactional
 	public BaseResponse<SysGroup> update(SysGroup query) {
 
 		if (StringUtils.isEmpty(query.getName())) {

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/TeamGroupServiceImpl.java

+package cn.wise.sc.cement.business.service.impl;
+
+import cn.wise.sc.cement.business.entity.SysGroup;
+import cn.wise.sc.cement.business.entity.SysPost;
+import cn.wise.sc.cement.business.entity.TeamGroup;
+import cn.wise.sc.cement.business.mapper.TeamGroupMapper;
+import cn.wise.sc.cement.business.mapper.TeamMapper;
+import cn.wise.sc.cement.business.model.BaseResponse;
+import cn.wise.sc.cement.business.model.PageQuery;
+import cn.wise.sc.cement.business.model.vo.GroupVo;
+import cn.wise.sc.cement.business.service.ITeamGroupService;
+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.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-09-10
+ */
+@Service
+public class TeamGroupServiceImpl extends ServiceImpl<TeamGroupMapper, TeamGroup> implements ITeamGroupService {
+
+	@Resource
+	private TeamGroupMapper teamGroupMapper;
+
+	/**
+	 * 获取分页
+	 * @param pageQuery
+	 * @return
+	 */
+	@Override
+	public BaseResponse<IPage<TeamGroup>> getPage(PageQuery pageQuery, String name) {
+		QueryWrapper<TeamGroup> qw = new QueryWrapper<>();
+		if(StringUtils.isNotEmpty(name)){
+			qw.like("name", name);
+		}
+		qw.orderByDesc("create_time");
+		IPage<TeamGroup> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
+		page = teamGroupMapper.selectPage(page, qw);
+		return BaseResponse.okData(page);
+	}
+
+	/**
+	 * 新增检测项组
+	 * @param query
+	 * @return
+	 */
+	@Override
+	@Transactional
+	public BaseResponse<TeamGroup> create(TeamGroup query) {
+		if (StringUtils.isEmpty(query.getName())) {
+			return BaseResponse.errorMsg("检测项组名称不能为空!");
+		}
+		QueryWrapper<TeamGroup> qw = new QueryWrapper<>();
+		qw.eq("name", query.getName());
+		int count = teamGroupMapper.selectCount(qw);
+		if (count > 0) {
+			return BaseResponse.errorMsg(query.getName() + "已存在");
+		}
+		query.setCreateTime(LocalDateTime.now());
+		teamGroupMapper.insert(query);
+		return BaseResponse.okData(query);
+	}
+
+	/**
+	 * 修改检测项组
+	 * @param query
+	 * @return
+	 */
+	@Override
+	@Transactional
+	public BaseResponse<TeamGroup> update(TeamGroup query) {
+		if (StringUtils.isEmpty(query.getName())) {
+			return BaseResponse.errorMsg("检测项组名称不能为空!");
+		}
+		QueryWrapper<TeamGroup> qw = new QueryWrapper<>();
+		qw.eq("name", query.getName());
+		qw.ne("id", query.getId());
+		int count = teamGroupMapper.selectCount(qw);
+		if (count > 0) {
+			return BaseResponse.errorMsg(query.getName() + "已存在");
+		}
+		teamGroupMapper.updateById(query);
+		return BaseResponse.okData(query);
+	}
+
+
+}