Merge remote-tracking branch 'origin/master'

Crunchy

2024-05-16 58a75277a83e48baa8ff9906e27975960659ff8a

Merge remote-tracking branch 'origin/master'

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

@@ -33,7 +33,8 @@
    private CapacityScopeService capacityScopeService;

    private ProductService productService;
    @ValueAuth

    @ValueClassify("能力范围")
    @ApiOperation(value = "获取项目检验参数列表")
    @PostMapping("/selectItemParameterList")
    public Result selectItemParameterList(@RequestBody Map<String, Object> data) throws Exception {
@@ -91,13 +92,13 @@
    public Result selectTestObjectByName() {
        return Result.success(capacityScopeService.selectTestObjectByName());
    }
    @ValueClassify("设备工具明细")
    @ValueClassify("设备")
    @ApiOperation(value = "设备里面选择检验项目(树形结构)")
    @PostMapping("/getInsProduction")
    public Result getInsProduction(){
        return Result.success(capacityScopeService.getInsProduction());
    }
    @ValueClassify(value="产品维护")
    @ValueClassify(value="能力范围")
    @ApiOperation(value = "维护检验对象的产品")
    @PostMapping("/selectProductListByObjectId")
    public Result selectProductListByObjectId(@RequestBody Map<String, Object> data) throws Exception {

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

@@ -1,10 +1,8 @@
package com.yuanchu.mom.controller;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.pojo.Certification;
import com.yuanchu.mom.pojo.Device;
import com.yuanchu.mom.service.CertificationService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
@@ -16,7 +14,6 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

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

@Api(tags = "资质说明")
@@ -26,7 +23,8 @@
public class CertificationController {

    private CertificationService certificationService;
    @ValueAuth

    @ValueClassify("实验室资质")
    @ApiOperation(value = "查询资质明细列表")
    @PostMapping("/getCertificationDetail")
    public Result getCertificationDetail(@RequestBody Map<String, Object> data) throws Exception {

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

@@ -4,9 +4,7 @@
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.UserDto;
import com.yuanchu.mom.dto.UserPageDto;
import com.yuanchu.mom.pojo.Department;
import com.yuanchu.mom.pojo.User;
import com.yuanchu.mom.service.DepartmentService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
@@ -14,7 +12,6 @@
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import org.springframework.stereotype.Controller;

import java.util.Map;

@@ -39,9 +36,9 @@
    public Result addDepartment(@RequestBody Department department) {
        return Result.success(departmentService.addDepartment(department));
    }
    @ValueAuth
    @ApiOperation(value = "获取部门树")
    @GetMapping("/selectDepartment")
    @ValueClassify("人员明细")
    public Result selectDepartment() {
        return Result.success(departmentService.selectDepartment());
    }

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

@@ -11,8 +11,6 @@
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
@@ -35,7 +33,8 @@

    @Value("${file.path}")
    private String filePath;
    @ValueAuth

    @ValueClassify("设备")
    @ApiOperation(value = "查询设备详情列表")
    @PostMapping("/selectDeviceParameter")
    public Result selectDeviceParameter(@RequestBody Map<String, Object> data) throws Exception {
@@ -43,19 +42,19 @@
        DeviceDto itemParameter = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), DeviceDto.class);
        return Result.success(deviceService.selectDeviceParameter(page, itemParameter));
    }
    @ValueClassify("设备工具明细")
    @ValueClassify("设备")
    @ApiOperation(value = "添加设备详情参数")
    @PostMapping("/addDeviceParameter")
    public Result addDeviceParameter(@RequestBody Device itemParameter) {
        return Result.success(deviceService.addDeviceParameter(itemParameter));
    }
    @ValueClassify("设备工具明细")
    @ValueClassify("设备")
    @ApiOperation(value = "删除设备详情参数")
    @PostMapping("/delDeviceParameter")
    public Result<?> delDeviceParameter(Integer id) {
        return Result.success(deviceService.delDeviceParameter(id));
    }
    @ValueClassify("设备工具明细")
    @ValueClassify("设备")
    @ApiOperation(value = "修改设备详情参数")
    @PostMapping("/upDeviceParameter")
    public Result<?> upDeviceParameter(@RequestBody Device itemParameter) {

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

@@ -1,7 +1,6 @@
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.ValueClassify;
@@ -15,7 +14,6 @@
import org.springframework.web.bind.annotation.*;

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

/**
@@ -31,7 +29,8 @@

    @Resource
    private LaboratoryService laboratoryService;
    @ValueAuth

    @ValueClassify("场所或设施")
    @ApiOperation(value = "查询实验室管理列表")
    @PostMapping("/selectItemParameter")
    public Result selectItemParameter(@RequestBody Map<String, Object> data) throws Exception {

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

@@ -4,15 +4,12 @@
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.pojo.StandardMethod;
import com.yuanchu.mom.pojo.StructureItemParameter;
import com.yuanchu.mom.service.StandardMethodService;
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 lombok.Value;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*;

import java.util.Map;
@@ -24,7 +21,8 @@
public class StandardMethodController {

    private StandardMethodService standardMethodService;
    @ValueAuth

    @ValueClassify("实验室的检测能力档案")
    @ApiOperation(value = "获取标准方法列表")
    @PostMapping("/selectStandardMethodList")
    public Result selectStandardMethodList(@RequestBody Map<String, Object> data) throws Exception {

 framework/src/main/java/com/yuanchu/mom/common/GetLook.java

@@ -26,7 +26,8 @@
        }
        Map<String, Integer> map = new HashMap<>();
        map.put("userId", id);
        map.put("look", authMapper.countPower(id, method));
        Integer look = authMapper.countPower(id, method);
        map.put("look", look==null?0:look);
        return map;
    }
}

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

@@ -1,6 +1,5 @@
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;
@@ -15,13 +14,13 @@
import com.yuanchu.mom.service.InsOrderService;
import com.yuanchu.mom.service.InsOrderTemplateService;
import com.yuanchu.mom.service.InsProductService;
import com.yuanchu.mom.service.InsSampleService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.context.annotation.Bean;
import org.springframework.web.bind.annotation.*;

import java.time.LocalDateTime;
@@ -42,7 +41,7 @@
    private InsOrderTemplateService insOrderTemplateService;

    //获取检验下单数据
    @ValueAuth
    @ValueClassify("检验下单")
    @ApiOperation(value = "查询检验下单数据")
    @PostMapping("/selectInsOrderParameter")
    public Result selectInsOrderParameter(@RequestBody Map<String, Object> data) throws Exception {
@@ -125,7 +124,7 @@
        SampleProductDto2 sampleProductDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), SampleProductDto2.class);
        return Result.success(insOrderService.selectSampleAndProductByOrderId(page, sampleProductDto));
    }
    @ValueAuth
    @ValueClassify("费用统计")
    @ApiOperation(value = "费用统计")
    @PostMapping("/costStatistics")
    public Result<?> costStatistics(@RequestBody Map<String, Object> data) throws Exception {
@@ -133,7 +132,7 @@
        CostStatisticsDto costStatisticsDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), CostStatisticsDto.class);
        return Result.success(insOrderService.costStatistics(page, costStatisticsDto));
    }
    @ValueAuth
    @ValueClassify("统计图表")
    @ApiOperation(value = "样品缺陷指数")
    @PostMapping("/selectSampleDefects")
    public Result selectSampleDefects(Integer size, Integer current, String inspectionItems, String orderNumber) {

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

@@ -29,7 +29,7 @@

    private InsOrderPlanService insOrderPlanService;

    @ValueAuth
    @ValueClassify("检验任务")
    @ApiOperation(value = "获取检验任务列表")
    @PostMapping("/selectInsOrderPlanList")
    public Result selectInsOrderPlanList(@RequestBody Map<String, Object> data) throws Exception {

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

@@ -40,7 +40,7 @@
    @Value("${wordUrl}")
    private String wordUrl;

    @ValueAuth
    @ValueClassify("报告编制")
    @ApiOperation(value = "查询检验报告数据")
    @PostMapping("/pageInsReport")
    public Result pageInsReport(@RequestBody Map<String, Object> data) throws Exception {

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

@@ -1,21 +1,17 @@
package com.yuanchu.mom.controller;


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.SampleOrderDto;
import com.yuanchu.mom.service.ReportService;
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 java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Map;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@RestController
@AllArgsConstructor
@@ -24,32 +20,33 @@
public class ReportController {

    private ReportService reportService;
    @ValueAuth

    @ValueClassify("统计图表")
    @ApiOperation(value = "每日业务统计")
    @GetMapping("/businessStatisticsByDay")
    public Result businessStatisticsByDay(){
        return Result.success(reportService.businessStatisticsByDay());
    }
    @ValueAuth
    @ValueClassify("统计图表")
    @ApiOperation(value = "检测项目统计")
    @GetMapping("/testProductByDay")
    public Result testProductByDay(){
        return Result.success(reportService.testProductByDay());
    }
    @ValueAuth
    @ApiOperation(value = "首页-->日历任务图")
    @ApiOperation(value = "日历任务图")
    @GetMapping("/calendarWorkByWeek")
    public Result calendarWorkByWeek(){
        return Result.success(reportService.calendarWorkByWeek());
    }
    @ValueClassify("个人首页")
    @ApiOperation(value = "首页-->添加日程")
    @ApiOperation(value = "添加日程")
    @PostMapping("/addSchedule")
    public Result addSchedule(String time, String text){
        return Result.success(reportService.addSchedule(time,text));
    }
    @ValueAuth
    @ApiOperation(value = "首页-->我的日程")
    @ApiOperation(value = "我的日程")
    @PostMapping("/ScheduleByMe")
    public Result ScheduleByMe(String date){
        return Result.success(reportService.ScheduleByMe(date));

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

@@ -8,7 +8,6 @@
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -22,7 +21,7 @@
public class StandardTemplateController {

    private StandardTemplateService standardTemplateService;
    @ValueAuth
    @ValueClassify("标准库")
    @ApiOperation(value = "获取原始记录模板列表")
    @PostMapping("/selectStandardTemplatePageList")
    public Result selectStandardTemplatePageList(@RequestBody Map<String, Object> data) throws Exception {
@@ -30,19 +29,19 @@
        StandardTemplate standardTemplate = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), StandardTemplate.class);
        return Result.success(standardTemplateService.selectStandardTemplatePageList(page, standardTemplate));
    }
    @ValueClassify("原始记录模板")
    @ValueClassify("标准库")
    @ApiOperation(value = "添加原始记录模板")
    @PostMapping("/addStandardTemplate")
    public Result addStandardTemplate(@RequestBody StandardTemplate standardTemplate) {
        return Result.success(standardTemplateService.addStandardTemplate(standardTemplate));
    }
    @ValueClassify("原始记录模板")
    @ValueClassify("标准库")
    @ApiOperation(value = "修改原始记录模板")
    @PostMapping("/upStandardTemplate")
    public Result<?> upStandardTemplate(@RequestBody StandardTemplate standardTemplate) {
        return Result.success(standardTemplateService.upStandardTemplate(standardTemplate));
    }
    @ValueClassify("原始记录模板")
    @ValueClassify("标准库")
    @ApiOperation(value = "删除原始记录模板")
    @PostMapping("/delStandardTemplate")
    public Result<?> delStandardTemplate(Integer id) {

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

@@ -25,7 +25,8 @@
    private StandardMethodListService standardMethodListService;

    private StandardProductListService standardProductListService;
    @ValueAuth

    @ValueClassify("标准库")
    @ApiOperation(value = "获取标准树")
    @GetMapping("/selectStandardTreeList")
    public Result selectStandardTreeList(){
@@ -37,6 +38,8 @@
    public Result addStandardTree(@RequestBody StandardTree standardTree){
        return Result.success(standardTreeService.addStandardTree(standardTree));
    }

    @ValueAuth
    @ValueClassify("标准库")
    @ApiOperation(value = "给标准树添加检验标准")
    @PostMapping("/addStandardMethodList")
@@ -56,12 +59,14 @@
    public Result upStandardProductList(@RequestBody StandardProductList list){
        return Result.success(standardProductListService.upStandardProductList(list));
    }
    @ValueAuth
    @ValueClassify("标准库")
    @ApiOperation(value = "删除标准树下的检验标准")
    @PostMapping("/delStandardMethodByFLSSM")
    public Result delStandardMethodByFLSSM(Integer id){
        return Result.success(standardMethodListService.delStandardMethodByFLSSM(id));
    }
    @ValueAuth
    @ValueClassify("标准库")
    @ApiOperation(value = "删除标准树下的检验项目")
    @PostMapping("/delStandardProductByIds")
@@ -69,12 +74,14 @@
        JSONArray lists = JSON.parseArray(ids);
        return Result.success(standardProductListService.delStandardProduct(lists));
    }
    @ValueAuth
    @ValueClassify("标准库")
    @ApiOperation(value = "新增标准树下的检验项目")
    @PostMapping("/addStandardProduct")
    public Result addStandardProduct(String ids, String tree){
        return Result.success(standardTreeService.addStandardProduct(ids, tree));
    }

    @ValueClassify("标准库")
    @ApiOperation(value = "删除标准树的层级")
    @PostMapping("/delStandardTree")
@@ -92,8 +99,8 @@
    @ApiOperation(value = "通过检验标准查询检验项目")
    @PostMapping("/selectStandardProductListByMethodId")
    @ValueAuth
    public Result selectStandardProductListByMethodId(Integer id, String tree){
        return Result.success(standardProductListService.selectStandardProductListByMethodId(id, tree));
    public Result selectStandardProductListByMethodId(Integer id, String tree, Integer page){
        return Result.success(standardProductListService.selectStandardProductListByMethodId(id, tree, page));
    }

    @ApiOperation(value = "获取标准树下标准方法枚举")

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

@@ -26,7 +26,8 @@
    public Result addWarehouse(String name) {
        return Result.success(warehouseService.addWarehouse(name));
    }
    @ValueAuth

    @ValueClassify("样品管理")
    @GetMapping("/selectWarehouse")
    @ApiOperation("查询仓库")
    public Result selectWarehouse() {

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

@@ -6,6 +6,7 @@
import com.yuanchu.mom.pojo.StandardProductList;

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

/**
* @author Administrator
@@ -20,6 +21,6 @@

    List<StandardProductList> selectStandardProductList(InsSample insSample);

    List<StandardProductList> selectStandardProductListByMethodId(Integer id, String tree);
    Map<String, Object> selectStandardProductListByMethodId(Integer id, String tree, Integer page);

}

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

@@ -16,9 +16,7 @@
import org.springframework.stereotype.Service;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;

@@ -103,7 +101,7 @@
    }

    @Override
    public List<StandardProductList> selectStandardProductListByMethodId(Integer id, String tree) {
    public Map<String, Object> selectStandardProductListByMethodId(Integer id, String tree, Integer page) {
        String[] trees = tree.split(" - ");
        List<StandardProductList> list = new ArrayList<>();
        if (trees.length == 3) {
@@ -154,6 +152,7 @@
                }
            }
        }
        if(page == 1){
        Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
        CompletableFuture.supplyAsync(() -> {
            standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate().eq(StandardProductList::getStandardMethodListId, id).like(StandardProductList::getTree, tree));
@@ -172,7 +171,15 @@
            e.printStackTrace();
            return null;
        });
        return list;
        }
        Map<String, Object> map = new HashMap<>();
        try {
            map.put("productList", list.subList((page - 1)*50, page * 50));
        }catch (IndexOutOfBoundsException e){
            map.put("productList", list.subList((page - 1)*50, list.size()));
        }
        map.put("total", list.size());
        return map;
    }
}


 inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java

@@ -22,8 +22,8 @@
    @ValueTableShow(value = 5,name = "状态")
    private String insState;

    @ValueTableShow(value = 8,name = "检验结果")
    private Integer insResult;
    @ValueTableShow(value = 8,name = "检验开始时间")
    private String insTime;

    @ValueTableShow(value = 6,name = "约定时间")
    private String appointed;

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

@@ -40,7 +40,7 @@
        io.sample_type,
        isu.user_id,
        ip.son_laboratory,
        io.ins_result
        io.ins_time
        FROM
        ins_order io
        LEFT JOIN ins_sample isa ON isa.ins_order_id = io.id
@@ -56,7 +56,7 @@
        io.id
        ) a
        LEFT JOIN ins_order_state ios ON ios.ins_order_id = a.id AND ios.laboratory = a.son_laboratory
        left join (SELECT c.user_id order_user_id, c.ins_sample_id from (SELECT * FROM ins_sample_user ORDER BY id DESC) c GROUP BY ins_sample_id having order_user_id = #{userId}) isu2 on isu2.ins_sample_id = a.id
        left join (SELECT td.user_id order_user_id, td.ins_sample_id FROM ins_sample_user td,(SELECT max(id) id FROM ins_sample_user GROUP BY ins_sample_id) md  where td.id = md.id and user_id = #{userId}) isu2 on isu2.ins_sample_id = a.id
        ORDER BY
        a.user_id DESC,
        a.type DESC,

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

@@ -59,7 +59,7 @@
                 left join standard_tree st on st.laboratory = l.laboratory_name
            and st.sample_type = sto.specimen_name
            and st.sample = p.name
        order by l.id,CAST(sto.code AS DECIMAL),st.id
        order by l.id,CAST(sto.code AS DECIMAL),p.id,ISNULL(st.id),st.id
    </select>

    <select id="selectStandardProductById" resultType="com.yuanchu.mom.pojo.StandardProductList">

 performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryWorkingHoursController.java

@@ -9,7 +9,6 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -34,6 +33,7 @@
    @Resource
    private AuxiliaryWorkingHoursService auxiliaryWorkingHoursService;

    @ValueClassify("工时管理")
    @ApiOperation(value="查询辅助工时")
    @PostMapping("/selectAuxiliaryWorkingHours")
    public Result selectAuxiliaryWorkingHours(@RequestBody Map<String, Object> data) throws Exception {
@@ -59,6 +59,5 @@
    public  Result insertAuxiliaryWorkingHours(@RequestBody AuxiliaryWorkingHours auxiliaryWorkingHours){
        return Result.success(auxiliaryWorkingHoursService.insertAuxiliaryWorkingHours(auxiliaryWorkingHours));
    }


}

 performance-server/src/main/java/com/yuanchu/mom/controller/PerformanceShiftController.java

@@ -4,6 +4,7 @@
import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.PerformanceShiftAddDto;
import com.yuanchu.mom.pojo.PerformanceShift;
import com.yuanchu.mom.service.PerformanceShiftService;
@@ -38,33 +39,38 @@
    @Autowired
    private PerformanceShiftService performanceShiftService;

    @ApiOperation(value = "绩效管理-班次-排班")
    @ValueClassify("班次")
    @ApiOperation(value = "排班")
    @PostMapping("add")
    public Result<?> performanceShiftAdd(@RequestBody PerformanceShiftAddDto performanceShiftAddDto) {
        performanceShiftService.performanceShiftAdd(performanceShiftAddDto);
        return Result.success();
    }

    @ApiOperation(value = "绩效管理-班次-月份分页查询")
    @ValueClassify("班次")
    @ApiOperation(value = "月份分页查询")
    @PostMapping("page")
    public Result<?> performanceShiftPage(Integer size, Integer current, String time, String userName, String laboratory) {
        return Result.success(performanceShiftService.performanceShiftPage(new Page<>(current, size), time, userName, laboratory));
    }

    @ApiOperation(value = "绩效管理-班次-年份分页查询")
    @ValueClassify("班次")
    @ApiOperation(value = "年份分页查询")
    @PostMapping("pageYear")
    public Result<?> performanceShiftPageYear(Integer size, Integer current, String time, String userName, String laboratory) {
        return Result.success(performanceShiftService.performanceShiftPageYear(new Page<>(current, size), time, userName, laboratory));
    }

    @ApiOperation(value = "绩效管理-班次-班次状态修改")
    @ValueClassify("班次")
    @ApiOperation(value = "班次状态修改")
    @PutMapping("update")
    public Result<?> performanceShiftUpdate(@RequestBody PerformanceShift performanceShift) {
        performanceShiftService.performanceShiftUpdate(performanceShift);
        return Result.success();
    }

    @ApiOperation(value = "绩效管理-班次-导出")
    @ValueClassify("班次")
    @ApiOperation(value = "导出")
    @GetMapping("export")
    public void exportToExcel(@NotNull(message = "时间不能为空！") String time, String userName, String laboratory, Boolean isMonth, HttpServletResponse response) throws Exception {
        Map<Object, Object> data;

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

@@ -38,7 +38,8 @@
    type: com.alibaba.druid.pool.DruidDataSource
    driverClassName: com.mysql.cj.jdbc.Driver
    #url: jdbc:mysql://localhost:3306/center_lims?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
    url: jdbc:mysql://114.132.189.42:9004/center-lims?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
#    url: jdbc:mysql://114.132.189.42:9004/center-lims?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
    url: jdbc:mysql://localhost:3306/center-lims?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
    username: root
    password: 123456
    druid:

 user-server/src/main/java/com/yuanchu/mom/controller/CompaniesController.java

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

import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
import cn.hutool.http.HttpUtil;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.pojo.AuthApi;
import com.yuanchu.mom.pojo.Company;
import com.yuanchu.mom.util.HeaderToken;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.Authorization;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.util.List;

@RestController
@AllArgsConstructor
@RequestMapping("/companies")
@Api("组织模块")
public class CompaniesController {

    @Autowired
    private HeaderToken headerToken;

    @ValueAuth
    @ApiOperation(value = "获取组织列表")
    @GetMapping(value = "/selectCompaniesList")
    public Result<List<Company>> selectcompaniesList(){
        return Result.success(headerToken.companyUrl());
    }
}

 user-server/src/main/java/com/yuanchu/mom/controller/EnumController.java

@@ -1,10 +1,8 @@
package com.yuanchu.mom.controller;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.RolePowerDto;
import com.yuanchu.mom.pojo.Enums;
import com.yuanchu.mom.service.EnumService;
import com.yuanchu.mom.utils.JackSonUtil;
@@ -12,7 +10,10 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.util.Map;

@@ -24,7 +25,7 @@

    private EnumService enumService;

    @ValueAuth
    @ValueClassify("数据字典")
    @ApiOperation(value = "获取枚举列表")
    @PostMapping("/selectEnumList")
    public Result selectEnumList(@RequestBody Map<String, Object> data) throws Exception {

 user-server/src/main/java/com/yuanchu/mom/controller/PostController.java

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

import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.pojo.Post;
import com.yuanchu.mom.util.HeaderToken;
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.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.List;

@RestController
@AllArgsConstructor
@RequestMapping("/post")
@Api("岗位模块")
public class PostController {

    @Autowired
    private HeaderToken headerToken;

    @ValueAuth
    @ApiOperation(value = "获取岗位列表")
    @PostMapping(value = "/selectPostList/{companyId}")
    public Result<List<Post>> selectPostList(@PathVariable String companyId){
        return Result.success(headerToken.postUrl(companyId));
    }
}

 user-server/src/main/java/com/yuanchu/mom/controller/RoleController.java

@@ -15,8 +15,6 @@
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;

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

@RequestMapping("/role")
@@ -28,6 +26,7 @@
    private RoleService roleService;

    private PowerService powerService;

    @ValueAuth
    @ApiOperation(value = "获取角色列表枚举")
    @GetMapping("/selectRoleList")
@@ -35,7 +34,7 @@
        return Result.success(roleService.selectList());
    }

    @ValueAuth
    @ValueClassify("角色管理")
    @ApiOperation(value = "获取角色列表")
    @PostMapping("/selectRoleLists")
    public Result selectRoleLists(@RequestBody Map<String, Object> data) throws Exception {

 user-server/src/main/java/com/yuanchu/mom/controller/SimpleController.java

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


import com.yuanchu.mom.pojo.User;
import com.yuanchu.mom.util.HeaderToken;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.List;


@AllArgsConstructor
@RestController
@RequestMapping("/simple")
@Api("人员模块")
public class SimpleController {

    @Autowired
    private HeaderToken headerToken;

    @PostMapping( value = "/selectSimpleList/companyId")
    public Result<List<User>> selectSimpleList(@PathVariable String companyId){
        return  Result.success(headerToken.userUrl(companyId));
    }
}

 user-server/src/main/java/com/yuanchu/mom/controller/SystemLogController.java

@@ -1,10 +1,8 @@
package com.yuanchu.mom.controller;



import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.pojo.PageSystemLogDto;
import com.yuanchu.mom.service.SystemLogService;
import com.yuanchu.mom.utils.JackSonUtil;
@@ -12,7 +10,10 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.util.Map;

@@ -29,6 +30,7 @@
public class SystemLogController  {

    private SystemLogService systemLogService;

    @ValueAuth
    @ApiOperation(value = "获取系统日志列表")
    @PostMapping("/selectSystemLogList")

 user-server/src/main/java/com/yuanchu/mom/controller/UserController.java

@@ -16,10 +16,8 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.util.DigestUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import java.util.HashMap;
import java.util.Map;
@@ -91,7 +89,8 @@
        }
        return Result.fail(map.get("info"));
    }
    @ValueAuth

    @ValueClassify("用户管理")
    @ApiOperation(value = "获取用户列表")
    @PostMapping("/selectUserList")
    public Result selectUserList(@RequestBody Map<String, Object> data) throws Exception {
@@ -122,7 +121,8 @@
    public Result<?> getUserMenu() {
        return Result.success(userService.getUserMenu());
    }
    @ValueAuth

    @ValueClassify("客户管理")
    @ApiOperation(value = "获取客户列表")
    @PostMapping("/selectCustomPageList")
    public Result selectCustomPageList(@RequestBody Map<String, Object> data) throws Exception {

 user-server/src/main/java/com/yuanchu/mom/pojo/AuthApi.java

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

public class AuthApi {

    public static String companies = "https://ztt-sso.asuncloud.net/api/org/v1/companies";

    public static String post="https://ztt-sso.asuncloud.net/api/org/v1/post?companyId=";

    public static String simple="https://ztt-sso.asuncloud.net/api/org/v1/employees/simple?companyId=";

}

 user-server/src/main/java/com/yuanchu/mom/pojo/Company.java

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

import lombok.Data;

@Data
public class Company {

    private String companyId;

    private String companyName;

    private String parentCompanyId;

    private String description;

    private String status;
}

 user-server/src/main/java/com/yuanchu/mom/pojo/Post.java

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

import lombok.Data;

@Data
public class Post {
    private String companyId;
    private String postCode;
    private String postName;
    private String deptCode;
    private String postType;
    private String status;
}

 user-server/src/main/java/com/yuanchu/mom/pojo/User.java

@@ -112,4 +112,26 @@
    @ApiModelProperty(value = "关联的部门id")
    private String departId;

    ////人员编号，全局唯一
//    private String employeeID;
////岗位
//    private String position;
////岗位编码
//    private String positionCode;
////手机号码
//    private String phoneNumber;
//
//    //性别 1:男 2:女
//    private int gender;
//
//    //组织状态 enable:在职 disabled:离职
//    private String status;
////所属组织编码
//    private String companyId;
////公司邮箱(可用于邮箱系统)
//    private String companyEmail;
////入职公司时间
//    private String dateOfJoiningTheCompany;
////组织内的部门编码
//    private String departmentCode;
}

 user-server/src/main/java/com/yuanchu/mom/service/impl/RoleServiceImp.java

@@ -1,27 +1,20 @@
package com.yuanchu.mom.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
import com.yuanchu.mom.dto.RolePowerDto;
import com.yuanchu.mom.dto.UserPageDto;
import com.yuanchu.mom.mapper.PowerMapper;
import com.yuanchu.mom.mapper.RoleMapper;
import com.yuanchu.mom.mapper.UserMapper;
import com.yuanchu.mom.pojo.Menu;
import com.yuanchu.mom.pojo.Power;
import com.yuanchu.mom.pojo.Role;
import com.yuanchu.mom.pojo.User;
import com.yuanchu.mom.service.RoleService;
import com.yuanchu.mom.service.UserService;
import com.yuanchu.mom.utils.Jwt;
import com.yuanchu.mom.utils.QueryWrappers;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.DigestUtils;

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

 user-server/src/main/java/com/yuanchu/mom/util/HeaderToken.java

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

import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
import com.alibaba.fastjson.JSON;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yuanchu.mom.pojo.AuthApi;
import com.yuanchu.mom.pojo.Company;
import com.yuanchu.mom.pojo.Post;
import com.yuanchu.mom.pojo.User;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import java.time.Duration;
import java.util.List;
import java.util.concurrent.TimeUnit;

@Component
public class HeaderToken {

    @Resource
    private RedisTemplate redisTemplate;

    public static void main(String[] args) {
        HttpRequest request = HttpRequest.post("https://ztt-sso.asuncloud.net/oauth2/token")
                .header("Content-Type", "application/x-www-form-urlencoded")
                .form("grant_type", "client_credentials")
                .form("client_id", "8b2f2c7e-2ab9-4718-8193-c0c636dceba8")
                .form("client_secret", "db59b70d28ab1865aafe4008f59d4760");

        HttpResponse response = request.execute();

        System.out.println(response.body());
    }

    public String fetchNewAccessToken() {
        HttpRequest request = HttpRequest.post("https://ztt-sso.asuncloud.net/oauth2/token")
                .header("Content-Type", "application/x-www-form-urlencoded")
                .form("grant_type", "client_credentials")
                .form("client_id", "8b2f2c7e-2ab9-4718-8193-c0c636dceba8")
                .form("client_secret", "db59b70d28ab1865aafe4008f59d4760");
        HttpResponse response = request.execute();

        System.out.println(response.body());
        ObjectMapper objectMapper = new ObjectMapper();
        JsonNode jsonNode = null;
        try {
            jsonNode = objectMapper.readTree(response.body());
            String accessToken = jsonNode.get("access_token").asText();
            redisTemplate.opsForValue().set("access_token",accessToken);
            redisTemplate.expire("access_token", dataTime("access_token"), TimeUnit.SECONDS);
        } catch (JsonProcessingException e) {
            e.printStackTrace();
        }
        return null;
    }
        private String accessToken ;

    //判断是否过期
    public String getAccessToken() {
        accessToken=(String) redisTemplate.opsForValue().get("access_token");
        if (accessToken == null) {
            accessToken = fetchNewAccessToken();
        }
        return accessToken;
    }
    //判断 token æ˜¯å¦å·²å­˜åœ¨
    public String getToken(String token) {
        String o = redisTemplate.opsForValue().get(token).toString();
        if (o != null && !o.isEmpty()) {
            return o;
        }else{
            redisTemplate.expire(token,dataTime("access_token"),TimeUnit.SECONDS);
            String tokens = redisTemplate.opsForValue().get(token).toString();
            return tokens;
        }
        // èŽ·å– token
//        accessToken = fetchNewAccessToken();
//        return accessToken;
    }

    //获取token过期时间
    public Long dataTime(String token){
        Long access_token = redisTemplate.getExpire(token);
        if(access_token != null && access_token >60) {
            redisTemplate.expire(token, access_token - 60 ,TimeUnit.SECONDS);
            return access_token - 60;
        }//就直接调用
        return null;
    }



    //调用
    public List<Company>  companyUrl() {
        String accessToken = getAccessToken();
        String getToken= getToken(accessToken);
        String apiUrl =AuthApi.companies; // æ›¿æ¢ä¸ºå®žé™…çš„API端点URL
        HttpRequest request = HttpRequest.get(apiUrl)
                .header("Authorization", "Bearer " + accessToken);
        HttpResponse response = request.execute();
        ObjectMapper objectMapper = new ObjectMapper();
        String body = response.body();
        List<Company> companies = null;
        try {
            companies = objectMapper.readValue(body, new TypeReference<List<Company>>(){});
        } catch (JsonProcessingException e) {
            e.printStackTrace();
        }
        return companies;
    }

    public List<Post>  postUrl(String companyId) {
        String accessToken = getAccessToken();
        String token = getToken(accessToken);
        String apiUrl =AuthApi.post+companyId; // æ›¿æ¢ä¸ºå®žé™…çš„API端点URL
        HttpRequest request = HttpRequest.get(apiUrl)
                .header("Authorization", "Bearer " + accessToken);
        HttpResponse response = request.execute();
        ObjectMapper objectMapper = new ObjectMapper();
        String body = response.body();
        List<Post> posts = null;
        try {
            posts=objectMapper.readValue(body, new TypeReference<List<Post>>() {});
        } catch (JsonProcessingException e) {
            e.printStackTrace();
        }
        return posts;
    }

    public List<User>  userUrl(String companyId) {
        String accessToken = getAccessToken();
        String token = getToken(accessToken);
        String apiUrl =AuthApi.simple+companyId; // æ›¿æ¢ä¸ºå®žé™…çš„API端点URL
        HttpRequest request = HttpRequest.get(apiUrl)
                .header("Authorization", "Bearer " + accessToken)
                .header("Content-Type", "application/form-data");
        HttpResponse response = request.execute();
        ObjectMapper objectMapper = new ObjectMapper();
        String body = response.body();
        List<User> user=null;
        try {
            user= objectMapper.readValue(body,new TypeReference<List<User>>(){});
        } catch (JsonProcessingException e) {
            e.printStackTrace();
        }
        return user;
    }
}

 user-server/src/main/java/com/yuanchu/mom/util/TestApi.java

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

import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
import com.yuanchu.mom.pojo.AuthApi;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

@Component
public class TestApi {

    @Autowired
    private HeaderToken headerToken;

    public void testApi() {
        String accessToken =headerToken.getAccessToken();
        String apiUrl = AuthApi.companies;
        // æ›¿æ¢ä¸ºå®žé™…çš„API端点URL
        HttpRequest request = HttpRequest.get(apiUrl)
                .header("Authorization", "Bearer " + accessToken);
        HttpResponse response = request.execute();
        System.out.println("Response Code: " + response.getStatus());
        System.out.println("Response Body: " + response.body());
    }
}

 user-server/src/main/resources/mapper/EnumMapper.xml

@@ -16,7 +16,7 @@

    <select id="selectEnumPageList" resultType="com.yuanchu.mom.pojo.Enums">
        select * from (
        select e.id,e.category,e.label,e.value,e.order_num,e.type , u2.name create_user_name,e.create_time, u3.name update_user_name, e.update_time
        select e.id,e.category,e.label,e.value,e.order_num,e.type , u2.name create_user_name,e.create_time, u3.name update_user_name, e.update_time,e.create_user
        from enums e
        left join user u2 on u2.id = e.create_user
        left join user u3 on u3.id = e.update_user