Merge remote-tracking branch 'origin/master'

Crunchy

2024-04-23 4f986140a10e71c07c7001ccbcda6e93e17736b1

Merge remote-tracking branch 'origin/master'

 cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java

@@ -1,29 +1,34 @@
package com.yuanchu.mom.controller;


import cn.hutool.core.lang.UUID;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueTableShow;
import com.yuanchu.mom.pojo.Laboratory;
import com.yuanchu.mom.service.LaboratoryService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import javax.annotation.Resources;
import java.util.Map;

/**
 * å®žéªŒå®¤ç®¡ç†(LaboratoryController)表控制层
 */
@Api(tags = "场所或设施")
@AllArgsConstructor

@RestController
@RequestMapping("/laboratoryScope")
public class LaboratoryController {
    @Value("${file.path}")
    private String filePath;

    @Resource
    private LaboratoryService laboratoryService;

    @ApiOperation(value = "查询实验室管理列表")
@@ -60,3 +65,9 @@
    }
}








 cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,59 @@
package com.yuanchu.mom.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.pojo.Laboratory;
import com.yuanchu.mom.pojo.Seal;
import com.yuanchu.mom.service.SealService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;
import java.util.Map;

/**
 * å°ç« ç®¡ç†(SealController)表控制层
 */
@Api(tags = "印章管理")

@RestController
@RequestMapping("/sealScope")
public class SealController {

    @Resource
    private SealService sealService;

    @ApiOperation(value = "删除印章")
    @PostMapping("/deleteSeal")
    public Result deleteSeal(@RequestBody Integer id) {
        return Result.success(sealService.delSeal(id));
    }
    @ApiOperation(value = "添加印章参数")
    @PostMapping("/addSeal")
    public Result addSeal(@RequestBody Seal seal) {
        int i = sealService.addSeal(seal);
        if(i>0){
            Integer labId = seal.getLabId();
            List<Laboratory> laboratory = sealService.Laboratory(labId);
            return Result.success(laboratory);
        }else{
            return Result.fail();
        }

    }
    @ApiOperation(value = "修改印章参数")
    @PostMapping("/upSeal")
    public  Result upSeal(@RequestBody Seal seal){
        return Result.success(sealService.upSeal(seal));
    }
    @ApiOperation(value="查询印章列表")
    @PostMapping("/selectSeal")
    public  Result selectSeal(@RequestBody Map<String, Object> data) throws Exception {
        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
        Seal seal = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Seal.class);
        return Result.success(sealService.selectSeal(page,seal));
    }
}

 cnas-server/src/main/java/com/yuanchu/mom/mapper/DepartmentMapper.java

@@ -29,6 +29,7 @@
    //根据选择的树展示相关的人员
    IPage<UserDto> showUserById(@Param("page") IPage<UserDto> page, @Param("ids") List<String> ids, @Param("ew") QueryWrapper<UserDto> ew);


    //根据部门id,查询他的所有子类id
    List<Integer> selectSonById(Integer id);
}

 cnas-server/src/main/java/com/yuanchu/mom/mapper/LaboratoryMapper.java

@@ -6,6 +6,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.pojo.Laboratory;

import java.util.Map;

/**
 * å®žéªŒå®¤ç®¡ç†(Laboratory)表数据库访问层
 */
@@ -14,5 +16,6 @@
    IPage<Laboratory> selectItemParameter(Page page, QueryWrapper<Laboratory> ew);

    Object obtainItemParameterList(Page page, QueryWrapper<Laboratory> queryWrappers);

}


 cnas-server/src/main/java/com/yuanchu/mom/mapper/SealMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package com.yuanchu.mom.mapper;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.pojo.Certification;

import com.yuanchu.mom.pojo.Laboratory;
import com.yuanchu.mom.pojo.Seal;

import java.util.List;
import java.util.Map;

public interface SealMapper extends BaseMapper<Seal> {
    IPage<Seal>selectSeal(Page page, QueryWrapper<Seal> ew);
    List<Laboratory> selectLaboratory (Integer labId);

}

 cnas-server/src/main/java/com/yuanchu/mom/pojo/Laboratory.java

@@ -6,6 +6,7 @@
import com.yuanchu.mom.common.OrderBy;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.io.Serializable;
import java.time.LocalDateTime;
@@ -15,6 +16,7 @@
 */
@TableName(value = "laboratory")
@Data
@NoArgsConstructor
public class Laboratory extends OrderBy implements Serializable {
    @ApiModelProperty(value = "主键")
    @TableId(type = IdType.AUTO)

 cnas-server/src/main/java/com/yuanchu/mom/pojo/Seal.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,45 @@
package com.yuanchu.mom.pojo;

import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yuanchu.mom.annotation.ValueTableShow;
import com.yuanchu.mom.common.OrderBy;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.time.LocalDateTime;

/**
 * å°ç« ç®¡ç†(Laboratory)表对象
 */

@TableName(value = "seal")
@Data
public class Seal extends OrderBy implements Serializable {
    @ApiModelProperty(value = "主键")
    @TableId(type = IdType.AUTO)
    private Integer id;
    @ValueTableShow(1)
    @ApiModelProperty(value = "实验室id")
    private Integer labId;
    @ValueTableShow(2)
    @ApiModelProperty(value = "印章图片")
    private String address;

    @ValueTableShow(3)
    @ApiModelProperty(value = "印章类型")
    private String type;
    @ApiModelProperty(value = "创建人id")
    @TableField(fill = FieldFill.INSERT)
    private Integer createUser;

    @ValueTableShow(5)
    @ApiModelProperty(value = "创建时间")
    @TableField(fill = FieldFill.INSERT)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime createTime;


}


 cnas-server/src/main/java/com/yuanchu/mom/service/LaboratoryService.java

@@ -22,5 +22,6 @@

    List<Laboratory> obtainItemParameterList();


}


 cnas-server/src/main/java/com/yuanchu/mom/service/SealService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@
package com.yuanchu.mom.service;


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.mom.pojo.Laboratory;
import com.yuanchu.mom.pojo.Seal;

import java.util.List;
import java.util.Map;

public interface SealService extends IService<Seal> {

    //新增
    int addSeal(Seal seal);
    //删除
    int delSeal(int id);
    //更新
    int upSeal(Seal seal);
    //查询
    Map<String, Object> selectSeal(Page page, Seal seal);

    List<Laboratory>  Laboratory(Integer id);


}

 cnas-server/src/main/java/com/yuanchu/mom/service/impl/LaboratoryServiceImpl.java

@@ -56,5 +56,7 @@
    public List<Laboratory> obtainItemParameterList() {
        return laboratoryMapper.selectList(Wrappers.<Laboratory>lambdaQuery().select(Laboratory::getLaboratoryName));
    }


}


 cnas-server/src/main/java/com/yuanchu/mom/service/impl/SealServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,52 @@
package com.yuanchu.mom.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
import com.yuanchu.mom.mapper.LaboratoryMapper;
import com.yuanchu.mom.mapper.SealMapper;
import com.yuanchu.mom.pojo.Certification;
import com.yuanchu.mom.pojo.Laboratory;
import com.yuanchu.mom.pojo.Seal;
import com.yuanchu.mom.service.SealService;
import com.yuanchu.mom.utils.QueryWrappers;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

import java.util.HashMap;
import java.util.List;
import java.util.Map;

@Service
@AllArgsConstructor
public class SealServiceImpl  extends ServiceImpl<SealMapper, Seal> implements SealService {
    private SealMapper sealMapper;


    @Override
    public int addSeal(Seal seal) {
        return sealMapper.insert(seal);
    }

    @Override
    public int delSeal(int id) {
        return sealMapper.deleteById(id);
    }

    @Override
    public int upSeal(Seal seal) {
        return sealMapper.updateById(seal);
    }

    @Override
    public Map<String, Object> selectSeal(Page page, Seal seal) {
        Map<String, Object> map = new HashMap<>();
        map.put("head", PrintChina.printChina(Seal.class));
        map.put("body", sealMapper.selectSeal(page, QueryWrappers.queryWrappers(seal)));
        return map;
    }
    @Override
    public List<Laboratory> Laboratory(Integer labId) {
        return sealMapper.selectLaboratory(labId);
    }
}

 cnas-server/src/main/resources/mapper/DeviceMapper.xml

@@ -80,7 +80,6 @@
    </select>

    <update id="upDeviceParameter" parameterType="com.yuanchu.mom.pojo.Device">

        UPDATE device
        <set>
            <if test="largeCategory!=null and largeCategory!='' ">large_category=#{largeCategory},</if>

 cnas-server/src/main/resources/mapper/LaboratoryMapper.xml

@@ -4,7 +4,6 @@
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.LaboratoryMapper">


    <select id="selectItemParameter" resultType="com.yuanchu.mom.pojo.Laboratory">
        select * from
        (

 cnas-server/src/main/resources/mapper/SealMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
<?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.yuanchu.mom.mapper.SealMapper">
    <select id="selectSeal" resultType="com.yuanchu.mom.pojo.Seal">
        select * from seal
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}
        </if>
    </select>
    <select id="selectLaboratory" resultType="com.yuanchu.mom.pojo.Laboratory">
        SELECT *
        from laboratory
        WHERE id =#{labId}
    </select>
</mapper>

 cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml

@@ -6,8 +6,10 @@
    <select id="selectItemParameterList" resultType="com.yuanchu.mom.pojo.StructureItemParameter">
        select id,
        inspection_item,
        inspection_item_en,
        inspection_item_classify,
        inspection_item_subclass,
        inspection_item_subclass_en,
        laboratory,
        unit,
        price,

 inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java

@@ -1,5 +1,6 @@
package com.yuanchu.mom.controller;

import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -18,6 +19,8 @@
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.*;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.context.annotation.Bean;
import org.springframework.web.bind.annotation.*;

import java.time.LocalDateTime;
@@ -57,7 +60,7 @@
    @ApiOperation(value = "添加检验下单数据")
    @PostMapping("/addInsOrder")
    public Result<?> addInsOrder(@RequestBody Map<String, Object> map) {
        JSONArray jsonArray = JSON.parseArray(JSON.toJSONString(map.get("list")));
        JSONArray jsonArray = JSON.parseArray(map.get("list")+"");
        List<SampleProductDto> list = jsonArray.toJavaList(SampleProductDto.class);
        InsOrder insOrder = JSON.parseObject(JSON.toJSONString(map.get("insOrder")), InsOrder.class);
        return Result.success(insOrderService.addInsOrder(list, insOrder));

 inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java

@@ -67,6 +67,8 @@
     */
    private String model;

    private String methodS;

    /**
     * å­å®žéªŒå®¤
     */

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java

@@ -123,9 +123,9 @@
    public Map<String, Object> doInsOrder(Integer id, String laboratory) {
        InsOrder insOrder = new InsOrder();
        insOrder.setId(id);
        insOrder.setInsState(1);
        InsOrder order = insOrderMapper.selectById(id);
        if (BeanUtil.isEmpty(order.getInsTime())) {
            insOrder.setInsState(1);
            insOrder.setInsTime(LocalDateTime.now());
            insOrderMapper.updateById(insOrder);
        }
@@ -165,7 +165,7 @@
                        map.put("v", JSON.parseObject(JSON.toJSONString(insValue.get("v"))).get("v"));
                        try {
                            if ((insValue.get("u") == null || insValue.get("u").equals("")) && StrUtil.isNotEmpty(JSON.parseObject(JSON.toJSONString(insValue.get("v"))).get("v").toString())) {
                                map.put("u", userId);
                                map.put("u", userId + "");
                            } else {
                                map.put("u", insValue.get("u"));
                            }
@@ -190,14 +190,23 @@
                if (resValue.get("v") != null) {
                    insProduct.setLastValue(JSON.parseObject(JSON.toJSONString(resValue.get("v"))).get("v") + "");
                }
                JSONObject equipValue = JSON.parseObject(JSON.toJSONString(jo.get("equipValue")));
                try {
                    result.setEquipValue(JSON.parseObject(JSON.toJSONString(equipValue.get("v"))).get("v") + "");
                } catch (Exception ignored) {
                    result.setEquipValue(null);
                if (jo.get("equipValue") != null) {
                    JSONArray jsonArray2 = JSON.parseArray(JSON.toJSONString(jo.get("equipValue")));
                    List<Map<String, Object>> ev = new ArrayList<>();
                    for (Object o : jsonArray2) {
                        JSONObject equipValue = JSON.parseObject(JSON.toJSONString(o));
                        Map<String, Object> map = new HashMap<>();
                        map.put("v", JSON.parseObject(JSON.toJSONString(equipValue.get("v"))).get("v"));
                        ev.add(map);
                }
                    result.setEquipValue(JSON.toJSONString(ev));
                }
                try {
                JSONObject insResult = JSON.parseObject(JSON.toJSONString(jo.get("insResult")));
                insProduct.setInsResult(Integer.parseInt(JSON.parseObject(JSON.toJSONString(insResult.get("v"))).get("v") + ""));
                    String ir = JSON.parseObject(JSON.toJSONString(insResult.get("v"))).get("v") + "";
                    insProduct.setInsResult(Integer.parseInt(ir));
                } catch (Exception e) {
                }
                if (BeanUtil.isEmpty(result.getId())) {
                    result.setCreateUser(userId);
                    result.setUpdateUser(userId);
@@ -496,33 +505,9 @@
                JSONObject sheet = JSON.parseObject(JSON.toJSONString(JSON.parseArray(JSON.toJSONString(JSON.parseObject(thing).get("data"))).get(0)));
                JSONObject config = JSON.parseObject(JSON.toJSONString(sheet.get("config")));
                List<JSONObject> cellData = JSON.parseArray(JSON.toJSONString(sheet.get("celldata")), JSONObject.class);
//                List<JSONObject> tableData = new ArrayList<>();
                Map<String, Object> style = new HashMap<>();
                style.put("rowlen", config.get("rowlen"));
                style.put("columnlen", config.get("columnlen"));
                /*int r = -1;
                if (BeanUtil.isNotEmpty(cellData)) {
                    for (JSONObject o : cellData) {
                        JSONObject v = JSON.parseObject(JSON.toJSONString(o.get("v")));
                        tableData.add(o);
                        if (BeanUtil.isNotEmpty(v.get("ps"))) {
                            JSONObject ps = JSON.parseObject(JSON.toJSONString(v.get("ps")));
                            if (ps.get("value").equals("检验项") && v.get("v").equals(product.getInspectionItem())) {
                                tableData.add(o);
                                r = Integer.parseInt(o.get("r") + "");
                                continue;
                            }
                        }
                        if (tableData.size() > 0) {
                            if ((Integer.parseInt(o.get("r") + "") == r + 1 || Integer.parseInt(o.get("r") + "") == r) && !(o.get("v") + "").equals("{\"ht\":\"0\"}")) {
                                r = Integer.parseInt(o.get("r") + "");
                                tableData.add(o);
                            } else {
                                break;
                            }
                        }
                    }
                }*/
                product.setTemplate(cellData);
                product.setStyle(style);
            }
@@ -533,9 +518,13 @@
    public int submitPlan(Integer orderId, String laboratory) {
        List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId).select(InsSample::getId));
        List<Integer> ids = insSamples.stream().map(a -> a.getId()).collect(Collectors.toList());
        List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().in(InsProduct::getInsSampleId, ids).eq(InsProduct::getSonLaboratory, laboratory).isNotNull(InsProduct::getInsResult));
        if (insProducts.size() == 0) {
            return 0;
        List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().in(InsProduct::getInsSampleId, ids).eq(InsProduct::getSonLaboratory, laboratory).eq(InsProduct::getState, 1).isNull(InsProduct::getInsResult));
        if (insProducts.size() > 0) {
            String str = "";
            for (InsProduct product : insProducts) {
                str += product.getInspectionItem()+product.getInspectionItemSubclass()+"；";
            }
            throw new ErrorException("以下是未检验的项目："+str);
        }
        insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, orderId).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, LocalDateTime.now()).set(InsOrderState::getInsState, 3));
        return 1;

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java

@@ -181,6 +181,7 @@
                                        pl2.setUpdateTime(LocalDateTime.now());
                                        pl2.setId(pl1.getId());
                                        pl2.setSample(tree.getSample());
                                        pl2.setDic(pl1.getDic());
                                        //如果标准库里面的要求有值则不更新,要求为null则同步更新
                                        if (ObjectUtils.isNotEmpty(pl1.getAsk())){
                                            pl2.setAsk(null);

 inspect-server/src/main/resources/mapper/InsSampleMapper.xml

@@ -104,7 +104,8 @@
               template_id,
               ipr.ins_value,
               ipr.com_value,
               ipr.equip_value
               ipr.equip_value,
               ip.method_s
        from ins_sample isa
        left join ins_product ip on isa.id = ip.ins_sample_id
        left join ins_product_result ipr on ip.id = ipr.ins_product_id
@@ -148,7 +149,8 @@
               template_id,
               ipr.ins_value,
               ipr.com_value,
               ipr.equip_value
               ipr.equip_value,
               ip.method_s
        from ins_sample isa
        left join ins_product ip on isa.id = ip.ins_sample_id
        left join ins_product_result ipr on ip.id = ipr.ins_product_id
@@ -216,6 +218,7 @@
        <result property="createTime" column="ip_create_time" jdbcType="TIMESTAMP"/>
        <result property="updateTime" column="ip_update_time" jdbcType="TIMESTAMP"/>
        <result property="templateId" column="template_id" jdbcType="INTEGER"/>
        <result property="methodS" column="method_s"/>
        <collection property="insProductResult" resultMap="insProductResult"/>
    </resultMap>


 system-run/src/main/resources/application-dev.yml

@@ -67,7 +67,7 @@
    # redis端口（默认为6379）
    port: 6379
    # redis访问密码（默认为空）
    password: null
    password: 123456
    # redis连接超时时间（单位毫秒）
    timeout: 50
    # redis连接池配置

 system-run/src/main/resources/application-prod.yml

@@ -55,7 +55,6 @@
      useGlobalDataSourceStat: true #合并多个DruidDatasource的监控数据
      connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=500; #通过connectProperties属性来打开mergesql功能罗慢sQL记录


redis:
  # redis数据库索引(默认为0)，我们使用索引为3的数据库，避免和其他数据库冲突
  database: 0