初始化配置

application-facade/pom.xml

@@ -60,10 +60,6 @@
             <artifactId>spring-boot-starter-freemarker</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

application-facade/src/main/java/com/factory/web/config/LocalDateTimeConverter.java

@@ -1,39 +0,0 @@
-package com.factory.web.config;
-
-
-import com.alibaba.excel.converters.Converter;
-import com.alibaba.excel.enums.CellDataTypeEnum;
-import com.alibaba.excel.metadata.CellData;
-import com.alibaba.excel.metadata.GlobalConfiguration;
-import com.alibaba.excel.metadata.property.ExcelContentProperty;
-
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-
-public class LocalDateTimeConverter implements Converter<LocalDateTime> {
-
-
-    @Override
-    public Class<LocalDateTime> supportJavaTypeKey() {
-        return LocalDateTime.class;
-    }
-
-    @Override
-    public CellDataTypeEnum supportExcelTypeKey() {
-        return CellDataTypeEnum.STRING;
-    }
-
-    @Override
-    public LocalDateTime convertToJavaData(CellData cellData, ExcelContentProperty contentProperty,
-                                           GlobalConfiguration globalConfiguration) {
-        return LocalDateTime.parse(cellData.getStringValue(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-    }
-
-    @Override
-    public CellData<String> convertToExcelData(LocalDateTime value, ExcelContentProperty contentProperty,
-                                               GlobalConfiguration globalConfiguration) {
-        return new CellData<>(value.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-    }
-
-
-}

application-facade/src/main/java/com/factory/web/controller/UserController.java

@@ -1,57 +0,0 @@
-package com.factory.web.controller;
-
-import com.factory.web.service.remote.UserInfoService;
-import com.factory.web.entity.vo.req.UserInsertReq;
-import com.factory.web.entity.vo.req.UserLockReq;
-import com.factory.web.entity.vo.req.UserPageQueryReq;
-import com.factory.web.entity.vo.res.UserRes;
-import com.factory.base.entity.aggregates.PageBean;
-import com.factory.base.entity.aggregates.ResponseBean;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-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;
-
-/**
- * 用户管理
- *
- * @author JCM
- * @date 2021/5/13 10:53
- */
-@Api(tags = "用户管理")
-@RestController
-@RequestMapping("/userController")
-public class UserController {
-
-    @Autowired
-    private UserInfoService userInfoService;
-
-    @ApiOperation("账户列表")
-    @PostMapping("/selectUser")
-    public ResponseBean<PageBean<UserRes>> selectUser(@RequestBody UserPageQueryReq userPageQueryReq){
-        return userInfoService.selectUser(userPageQueryReq);
-    }
-
-    @ApiOperation("用户新增")
-    @PostMapping("/insertUser")
-    public ResponseBean<String> insertUser(@RequestBody UserInsertReq userInsertReq){
-        return userInfoService.insertUser(userInsertReq);
-    }
-
-    @ApiOperation("用户修改")
-    @PostMapping("/updateUser")
-    public ResponseBean<String> updateUser(@RequestBody UserInsertReq userInsertReq){
-        return userInfoService.updateUser(userInsertReq);
-    }
-
-    @ApiOperation("用户禁用")
-    @PostMapping("/userLock")
-    public ResponseBean<String> userLock(@RequestBody UserLockReq userLockReq){
-        return userInfoService.userLock(userLockReq);
-    }
-
-
-}

application-facade/src/main/java/com/factory/web/entity/vo/enumPo/CheckType.java

@@ -1,13 +0,0 @@
-package com.factory.web.entity.vo.enumPo;
-
-public enum CheckType {
-    //检查结果类型 首件 二百
-    FIRST(1),
-    TWOHUNDRED(2),
-    BREAK(3);
-    public final Integer value;
-    CheckType(Integer value) {
-        this.value = value;
-    }
-
-}

application-facade/src/main/java/com/factory/web/entity/vo/enumPo/CheckTypeSubmit.java

@@ -1,13 +0,0 @@
-package com.factory.web.entity.vo.enumPo;
-
-public enum CheckTypeSubmit {
-    //检查单-某一类型的提交状态 1未保存2保存3提交
-    UNSAVE(0),
-    SAVE(1),
-    SUBMIT(2);
-    public final Integer value;
-    CheckTypeSubmit(Integer value) {
-        this.value = value;
-    }
-
-}

application-facade/src/main/java/com/factory/web/entity/vo/enumPo/FrequencyType.java

@@ -1,69 +0,0 @@
-package com.factory.web.entity.vo.enumPo;
-
-import java.time.*;
-import java.time.temporal.TemporalAdjusters;
-import java.util.function.Function;
-
-public enum  FrequencyType {
-    //频次  日  周  月
-    Day(1,
-            "每日",
-            Function.identity(),
-            Function.identity()),
-
-    Week(2,
-            "每周",
-            item->item.with(TemporalAdjusters.previous(DayOfWeek.MONDAY)),
-            item-> {
-                LocalDate with = item.with(TemporalAdjusters.next(DayOfWeek.SUNDAY));
-                return with;
-            }),
-    Month(3,
-            "每月",
-            item->item.with(TemporalAdjusters.firstDayOfMonth()),
-            item->item.with(TemporalAdjusters.lastDayOfMonth())),
-    QUARTER(4,
-            "每季度",
-            item->{
-                Month firstMonthOfQuarter = java.time.Month.of(item.getMonth().firstMonthOfQuarter().getValue());
-                Month firstMonthOfNextQuarter = firstMonthOfQuarter.plus(3L);
-                int yearOfNextQuarter = firstMonthOfQuarter.getValue() > 9 ? item.getYear() + 1 : item.getYear();
-                return LocalDateTime.of(LocalDate.of(yearOfNextQuarter, firstMonthOfNextQuarter, 1), LocalTime.MIN).toLocalDate();
-            },
-            item->{
-                Month firstMonthOfQuarter = java.time.Month.of(item.getMonth().firstMonthOfQuarter().getValue());
-                Month firstMonthOfNextQuarter = firstMonthOfQuarter.plus(5L);
-                int yearOfNextQuarter = firstMonthOfQuarter.getValue() > 9 ? item.getYear() + 1 : item.getYear();
-                return LocalDateTime.of(LocalDate.of(yearOfNextQuarter, firstMonthOfNextQuarter, firstMonthOfNextQuarter.maxLength()), LocalTime.MAX).toLocalDate();
-            }),
-    HALFYEAR(5,
-            "每半年",
-            item->{
-                int lastHalfYear = (item.getMonthValue() > 6) ? item.getYear() : item.getYear() - 1;
-                java.time.Month firstMonthOfLastHalfYear = (item.getMonthValue() > 6) ? java.time.Month.JANUARY : java.time.Month.JULY;
-                LocalDateTime of = LocalDateTime.of(LocalDate.of(lastHalfYear, firstMonthOfLastHalfYear, 1), LocalTime.MIN);
-                return of.toLocalDate();
-            },
-            item->{
-                int lastHalfYear = (item.getMonthValue() > 6) ? item.getYear() : item.getYear() - 1;
-                Month firstMonthOfLastHalfYear = (item.getMonthValue() > 6) ? java.time.Month.JANUARY : java.time.Month.JULY;
-                return LocalDateTime.of(LocalDate.of(lastHalfYear, firstMonthOfLastHalfYear, 1), LocalTime.MIN).toLocalDate();
-            }),
-    TEAM(6,
-            "班/次",
-            Function.identity(),
-            Function.identity());
-
-    public final Integer value;
-    public final String desc;
-    public final Function getFirstDate;
-    public final Function getEndDate;
-    FrequencyType(Integer value,String desc, Function<LocalDate, LocalDate> getFirstDate,Function<LocalDate, LocalDate> getEndDate) {
-        this.value = value;
-        this.desc = desc;
-        this.getFirstDate = getFirstDate;
-        this.getEndDate = getEndDate;
-    }
-
-
-}

application-facade/src/main/java/com/factory/web/entity/vo/enumPo/ResStatus.java

@@ -1,15 +0,0 @@
-package com.factory.web.entity.vo.enumPo;
-
-public enum ResStatus {
-    //响应状态
-    //待响应 已响应/未响应 已完成
-    WAIT(1),
-    UNRES(2),
-    RES(3),
-    Finished(4);
-    public final Integer value;
-    ResStatus(Integer value) {
-        this.value = value;
-    }
-
-}

application-facade/src/main/java/com/factory/web/entity/vo/enumPo/RoleEnum.java

@@ -1,13 +0,0 @@
-package com.factory.web.entity.vo.enumPo;
-
-public enum RoleEnum {
-    //响应状态
-    //待响应 已响应/未响应 已完成
-    质量工程师("58"),
-    质量经理("57"),
-    生产经理("56");
-    public final String value;
-    RoleEnum(String value) {
-        this.value = value;
-    }
-}

application-facade/src/main/java/com/factory/web/entity/vo/enumPo/VersionAuditStatus.java

@@ -1,14 +0,0 @@
-package com.factory.web.entity.vo.enumPo;
-
-public enum VersionAuditStatus {
-    //审核结果 1待审核 2当前版本 3历史版本 4驳回
-    UNAUDIT(1),
-    CURRENT(2),
-    HISTORY(3),
-    TURNDOWN(4);
-    public final Integer value;
-    VersionAuditStatus(Integer value) {
-        this.value = value;
-    }
-
-}

application-facade/src/main/java/com/factory/web/entity/vo/excel/ExcelFillCellMergeStrategy.java

@@ -1,102 +0,0 @@
-package com.factory.web.entity.vo.excel;
-
-import com.alibaba.excel.metadata.CellData;
-import com.alibaba.excel.metadata.Head;
-import com.alibaba.excel.write.handler.CellWriteHandler;
-import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
-import com.alibaba.excel.write.metadata.holder.WriteTableHolder;
-import lombok.Data;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.util.CellRangeAddress;
-
-import java.util.List;
-
-@Data
-public class ExcelFillCellMergeStrategy implements CellWriteHandler {
-	/**
-	 * 合并字段的下标
-	 */
-	private int[] mergeColumnIndex;
-	/**
-	 * 合并几行
-	 */
-	private int mergeRowIndex;
-
-	public ExcelFillCellMergeStrategy() {
-	}
-
-	public ExcelFillCellMergeStrategy(int mergeRowIndex, int[] mergeColumnIndex) {
-		this.mergeRowIndex = mergeRowIndex;
-		this.mergeColumnIndex = mergeColumnIndex;
-	}
-
-	@Override
-	public void beforeCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Row row,
-                                 Head head, Integer integer, Integer integer1, Boolean aBoolean) {
-
-	}
-
-	@Override
-	public void afterCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Cell cell,
-                                Head head, Integer integer, Boolean aBoolean) {
-
-	}
-
-	@Override
-	public void afterCellDataConverted(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder,
-                                       CellData cellData, Cell cell, Head head, Integer integer, Boolean aBoolean) {
-
-	}
-
-	@Override
-	public void afterCellDispose(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder,
-                                 List<CellData> list, Cell cell, Head head, Integer integer, Boolean aBoolean) {
-//当前行
-		int curRowIndex = cell.getRowIndex();
-		//当前列
-		int curColIndex = cell.getColumnIndex();
-
-		if (curRowIndex > mergeRowIndex) {
-			for (int i = 0; i < mergeColumnIndex.length; i++) {
-				if (curColIndex == mergeColumnIndex[i]) {
-					mergeWithPrevRow(writeSheetHolder, cell, curRowIndex, curColIndex);
-					break;
-				}
-			}
-		}
-	}
-
-	private void mergeWithPrevRow(WriteSheetHolder writeSheetHolder, Cell cell, int curRowIndex, int curColIndex) {
-		//获取当前行的当前列的数据和上一行的当前列列数据，通过上一行数据是否相同进行合并
-		Object curData = cell.getCellTypeEnum() == CellType.STRING ? cell.getStringCellValue() :
-				cell.getNumericCellValue();
-		Cell preCell = cell.getSheet().getRow(curRowIndex - 1).getCell(curColIndex);
-		Object preData = preCell.getCellTypeEnum() == CellType.STRING ? preCell.getStringCellValue() : preCell.getNumericCellValue();
-		// 比较当前行的第一列的单元格与上一行是否相同，相同合并当前单元格与上一行
-		//
-		if (curData.equals(preData)) {
-			Sheet sheet = writeSheetHolder.getSheet();
-			List<CellRangeAddress> mergeRegions = sheet.getMergedRegions();
-			boolean isMerged = false;
-			for (int i = 0; i < mergeRegions.size() && !isMerged; i++) {
-				CellRangeAddress cellRangeAddr = mergeRegions.get(i);
-				// 若上一个单元格已经被合并，则先移出原有的合并单元，再重新添加合并单元
-				if (cellRangeAddr.isInRange(curRowIndex - 1, curColIndex)) {
-					sheet.removeMergedRegion(i);
-					cellRangeAddr.setLastRow(curRowIndex);
-					sheet.addMergedRegion(cellRangeAddr);
-					isMerged = true;
-				}
-			}
-			// 若上一个单元格未被合并，则新增合并单元
-			if (!isMerged) {
-				CellRangeAddress cellRangeAddress = new CellRangeAddress(curRowIndex - 1, curRowIndex, curColIndex,
-						curColIndex);
-				sheet.addMergedRegion(cellRangeAddress);
-			}
-		}
-	}
-}

application-facade/src/main/java/com/factory/web/entity/vo/excel/FillData.java

@@ -1,34 +0,0 @@
-package com.factory.web.entity.vo.excel;
-
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class FillData {
-    private String no;
-    private String characteristics;
-    private String measuringRange;
-    private String method;
-    private String frequency;
-    private String clazz;
-    private String tool;
-    private String releaseRecord;
-    private String workstation;
-    private String inistation;
-    private String inigread;
-    private String twoStation;
-    private String twoGread;
-    private String breakOffstation;
-    private String breakOffgread;
-    private String firOrder;
-    private String towOrder;
-    private String breOrder;
-
-
-}

application-facade/src/main/java/com/factory/web/entity/vo/excel/IssueQualityExport.java

@@ -1,139 +0,0 @@
-package com.factory.web.entity.vo.excel;
-
-import com.factory.web.config.LocalDateTimeConverter;
-import com.alibaba.excel.annotation.ExcelIgnore;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.annotation.write.style.ColumnWidth;
-import com.alibaba.excel.annotation.write.style.ContentRowHeight;
-import com.alibaba.excel.annotation.write.style.HeadRowHeight;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.time.LocalDateTime;
-
-/**
- * @program: factory-point-inspection
- * @description:
- * @author: dl
- * @create: 03月12日 15时
- **/
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@ContentRowHeight(20)
-@HeadRowHeight(20)
-@ColumnWidth(25)
-public class IssueQualityExport {
-
-    @ExcelIgnore
-    private Long id;
-    /**
-     * 中长期责任人
-     */
-    @ExcelProperty(value = "长期责任人")
-    private String longPrincipalName;
-
-    /**
-     * 短期责任人
-     */
-    @ExcelProperty(value = "短期责任人")
-    private String shortPrincipalName;
-    /**
-     * 短期责任部门
-     */
-    @ExcelProperty(value = "短期责任部门")
-    private String shortTimeDepartmentName;
-
-    /**
-     * 长期负责部门
-     */
-    @ExcelProperty(value = "长期负责部门")
-    private String longtimeDepartmentName;
-
-    /**
-     * 发生时间
-     */
-    @ExcelProperty(value = "发生时间", converter = LocalDateTimeConverter.class)
-    private LocalDateTime startTime;
-
-    /**
-     * 问题描述
-     */
-    @ExcelProperty(value = "问题描述")
-    private String detail;
-
-    /**
-     * 创建人
-     */
-    @ExcelProperty(value = "记录人")
-    private String createdUsername;
-
-    /**
-     * 状态
-     */
-    @ExcelProperty(value = "状态")
-    private String statusValue;
-    /**
-     * 缺陷类型 对应源系统dict表
-     */
-    @ExcelProperty(value = "缺陷类型")
-    private String defectTypeName;
-
-    /**
-     * 过程 对应源系统dict表
-     */
-    @ExcelProperty(value = "过程")
-    private String processName;
-    /**
-     * 发生地点
-     */
-    @ExcelProperty(value = "发生地点")
-    private String areaName;
-    /**
-     * 零件选择 对应源系统dict表
-     */
-    @ExcelProperty(value = "零件选择")
-    private String partName;
-    /**
-     * 完成时间
-     */
-    @ExcelProperty(value = "完成时间", converter = LocalDateTimeConverter.class)
-    private LocalDateTime finishTime;
-
-    @ExcelProperty(value = "短期措施根本原因")
-    private String shortCause;
-
-    @ExcelProperty(value = "短期措施")
-    private String shortSolution;
-
-    @ExcelProperty(value = "短期计划完成时间", converter = LocalDateTimeConverter.class)
-    private LocalDateTime shortPlanFinishTime;
-
-    @ExcelProperty(value = "短期实际完成时间", converter = LocalDateTimeConverter.class)
-    private LocalDateTime shortCompletionTime;
-
-    @ExcelProperty(value = "短期措施根本原因")
-    private String longCause;
-
-    @ExcelProperty(value = "中长措施")
-    private String middleSolution;
-
-    @ExcelProperty(value = "中长计划完成时间", converter = LocalDateTimeConverter.class)
-    private LocalDateTime middlePlanFinishTime;
-
-    @ExcelProperty(value = "中长实际完成时间", converter = LocalDateTimeConverter.class)
-    private LocalDateTime middleCompletionTime;
-
-    @ExcelProperty(value = "长期措施")
-    private String longSolution;
-
-    @ExcelProperty(value = "长期计划完成时间", converter = LocalDateTimeConverter.class)
-    private LocalDateTime longPlanFinishTime;
-
-    @ExcelProperty(value = "长期实际完成时间", converter = LocalDateTimeConverter.class)
-    private LocalDateTime longCompletionTime;
-
-}

application-facade/src/main/java/com/factory/web/entity/vo/excel/IssueStopExport.java

@@ -1,101 +0,0 @@
-package com.factory.web.entity.vo.excel;
-
-import com.factory.web.config.LocalDateTimeConverter;
-import com.alibaba.excel.annotation.ExcelIgnore;
-import com.alibaba.excel.annotation.ExcelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.time.LocalDateTime;
-
-/**
- * @program: factory-point-inspection
- * @description:
- * @author: dl
- * @create: 03月12日 15时
- **/
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class IssueStopExport {
-
-    @ExcelIgnore
-    private Long id;
-
-    @ExcelProperty(value = "发生时间", converter = LocalDateTimeConverter.class)
-    private LocalDateTime startTime;
-
-    @ExcelProperty(value = "发生地点")
-    private String areaName;
-
-    @ExcelProperty(value = "工位")
-    private String workstationName;
-
-    @ExcelProperty(value = "项目名称")
-    private String projectName;
-
-    @ExcelProperty(value = "零件名称")
-    private String partName;
-
-    @ExcelProperty(value = "责任部门")
-    private String departmentName;
-
-    @ExcelProperty(value = "停机分组")
-    private String stopGroupName;
-
-    @ExcelProperty(value = "停机类型")
-    private String stopTypeName;
-
-    @ExcelProperty(value = "SQP类型")
-    private String sqpTypeName;
-
-    @ExcelProperty(value = "rank")
-    private String rankName;
-
-    @ExcelProperty(value = "停机时长(分钟)")
-    private Integer stopTime;
-
-    @ExcelProperty(value = "责任人")
-    private String principalName;
-
-    @ExcelProperty(value = "问题描述")
-    private String detail;
-
-    @ExcelProperty(value = "记录人")
-    private String createdUsername;
-
-    @ExcelProperty(value = "状态")
-    private String statusValue;
-
-    @ExcelProperty(value = "完成时间", converter = LocalDateTimeConverter.class)
-    private LocalDateTime finishTime;
-
-    @ExcelProperty(value = "短期措施根本原因")
-    private String shortCause;
-
-    @ExcelProperty(value = "短期措施")
-    private String shortSolution;
-
-    @ExcelProperty(value = "短期计划完成时间", converter = LocalDateTimeConverter.class)
-    private LocalDateTime shortPlanFinishTime;
-
-    @ExcelProperty(value = "短期实际完成时间", converter = LocalDateTimeConverter.class)
-    private LocalDateTime shortCompletionTime;
-
-    @ExcelProperty(value = "长期措施根本原因")
-    private String longCause;
-
-    @ExcelProperty(value = "长期措施")
-    private String longSolution;
-
-
-    @ExcelProperty(value = "长期计划完成时间", converter = LocalDateTimeConverter.class)
-    private LocalDateTime longPlanFinishTime;
-
-    @ExcelProperty(value = "长期实际完成时间", converter = LocalDateTimeConverter.class)
-    private LocalDateTime longCompletionTime;
-
-}

application-facade/src/main/java/com/factory/web/entity/vo/excel/LongdyExcel.java

@@ -1,51 +0,0 @@
-package com.factory.web.entity.vo.excel;
-
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class LongdyExcel {
-    private String flow;
-    private String longdyProject;
-    private String standard;
-    private String frequency;
-    private String o1;
-    private String o2;
-    private String o3;
-    private String o4;
-    private String o5;
-    private String o6;
-    private String o7;
-    private String o8;
-    private String o9;
-    private String o10;
-    private String o11;
-    private String o12;
-    private String o13;
-    private String o14;
-    private String o15;
-    private String o16;
-    private String o17;
-    private String o18;
-    private String o19;
-    private String o20;
-    private String o21;
-    private String o22;
-    private String o23;
-    private String o24;
-    private String o25;
-    private String o26;
-    private String o27;
-    private String o28;
-    private String o29;
-    private String o30;
-    private String o31;
-
-
-}

application-facade/src/main/java/com/factory/web/entity/vo/excel/TestFileUtil.java

@@ -1,36 +0,0 @@
-package com.factory.web.entity.vo.excel;
-
-import java.io.File;
-import java.io.InputStream;
-
-public class TestFileUtil {
-
-
-    public static InputStream getResourcesFileInputStream(String fileName) {
-        return Thread.currentThread().getContextClassLoader().getResourceAsStream("" + fileName);
-    }
-
-    public static String getPath() {
-        return TestFileUtil.class.getResource("/").getPath();
-    }
-
-    public static File createNewFile(String pathName) {
-        File file = new File(getPath() + pathName);
-        if (file.exists()) {
-            file.delete();
-        } else {
-            if (!file.getParentFile().exists()) {
-                file.getParentFile().mkdirs();
-            }
-        }
-        return file;
-    }
-
-    public static File readFile(String pathName) {
-        return new File(getPath() + pathName);
-    }
-
-    public static File readUserHomeFile(String pathName) {
-        return new File(System.getProperty("user.home") + File.separator + pathName);
-    }
-}

application-facade/src/main/java/com/factory/web/entity/vo/req/MenuInsertReq.java

@@ -1,25 +0,0 @@
-package com.factory.web.entity.vo.req;
-
-import com.factory.base.config.auth.MenuType;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class MenuInsertReq {
-
-    private String name;
-
-    private String route;
-
-    private String icon;
-
-    private Long parentId;
-
-    private MenuType type;
-
-    private String description;
-
-}

application-facade/src/main/java/com/factory/web/entity/vo/req/MenuPageQueryReq.java

@@ -1,15 +0,0 @@
-package com.factory.web.entity.vo.req;
-
-import com.factory.base.entity.vo.req.BasePageSortReq;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class MenuPageQueryReq extends BasePageSortReq {
-
-    private String name;
-
-}

application-facade/src/main/java/com/factory/web/entity/vo/req/MenuUpdateReq.java

@@ -1,29 +0,0 @@
-package com.factory.web.entity.vo.req;
-
-import com.factory.base.config.auth.MenuType;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class MenuUpdateReq {
-
-    private Long id;
-
-    private String name;
-
-    private String route;
-
-    private String icon;
-
-    private Long parentId;
-
-    private MenuType type;
-
-    private Long isNode;
-
-    private String description;
-
-}

application-facade/src/main/java/com/factory/web/entity/vo/req/RoleInsertReq.java

@@ -1,20 +0,0 @@
-package com.factory.web.entity.vo.req;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class RoleInsertReq {
-
-    private Long parentId;
-
-    private String name;
-
-    private String securityName;
-
-    private String description;
-
-}

application-facade/src/main/java/com/factory/web/entity/vo/req/RolePageQueryReq.java

@@ -1,14 +0,0 @@
-package com.factory.web.entity.vo.req;
-
-import com.factory.base.entity.vo.req.BasePageSortReq;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class RolePageQueryReq extends BasePageSortReq {
-
-    private String name;
-}

application-facade/src/main/java/com/factory/web/entity/vo/req/RoleUpdateReq.java

@@ -1,22 +0,0 @@
-package com.factory.web.entity.vo.req;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class RoleUpdateReq {
-
-    private Long id;
-
-    private Long parentId;
-
-    private String name;
-
-    private String securityName;
-
-    private String description;
-
-}

application-facade/src/main/java/com/factory/web/entity/vo/req/UserInsertReq.java

@@ -1,29 +0,0 @@
-package com.factory.web.entity.vo.req;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@ApiModel("新增-编辑用户")
-public class UserInsertReq {
-
-    @ApiModelProperty("用户id:新增不传，编辑传")
-    private Long id;
-
-    @ApiModelProperty("用户名称")
-    private String username;
-
-    @ApiModelProperty("用户密码")
-    private String password;
-
-    @ApiModelProperty("角色id")
-    private Long roleId;
-
-    @ApiModelProperty("班次")
-    private Long shiftId;
-}

application-facade/src/main/java/com/factory/web/entity/vo/req/UserLockReq.java

@@ -1,25 +0,0 @@
-package com.factory.web.entity.vo.req;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * 用户管理
- *
- * @author JCM
- * @date 2021/5/13 20:36
- */
-@Data
-@ApiModel("用户管理")
-public class UserLockReq {
-
-    @ApiModelProperty("用户id")
-    private Long id;
-
-    @ApiModelProperty("设置:false.解禁 true.禁用")
-    private boolean no;
-
-    @ApiModelProperty("班次")
-    private Long shiftId;
-}

application-facade/src/main/java/com/factory/web/entity/vo/req/UserPageQueryReq.java

@@ -1,22 +0,0 @@
-package com.factory.web.entity.vo.req;
-
-import com.factory.base.entity.vo.req.BasePageReq;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@ApiModel("用户列表筛选参数")
-public class UserPageQueryReq extends BasePageReq {
-
-    @ApiModelProperty("用户名称")
-    private String name;
-
-    @ApiModelProperty("角色id")
-    private Long roleId;
-
-}

application-facade/src/main/java/com/factory/web/entity/vo/req/UserUpdateReq.java

@@ -1,28 +0,0 @@
-package com.factory.web.entity.vo.req;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class UserUpdateReq {
-
-    private Long id;
-
-    private String nickname;
-
-    private String realName;
-
-    private String username;
-
-    private String password;
-
-    private String phone;
-
-    private String email;
-
-    private String headId;
-
-}

application-facade/src/main/java/com/factory/web/entity/vo/res/ButtonRes.java

@@ -1,17 +0,0 @@
-package com.factory.web.entity.vo.res;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ButtonRes {
-
-    private String name;
-
-    private Long id;
-
-    private Long menuId;
-}

application-facade/src/main/java/com/factory/web/entity/vo/res/FieldNameRes.java

@@ -1,19 +0,0 @@
-package com.factory.web.entity.vo.res;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class FieldNameRes {
-
-    @ApiModelProperty(value = "字段名")
-    private String Field;
-
-    @ApiModelProperty(value = "备注")
-    private String Comment;
-
-}

application-facade/src/main/java/com/factory/web/entity/vo/res/FileRes.java

@@ -1,37 +0,0 @@
-package com.factory.web.entity.vo.res;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-@ApiModel("统一上传返回")
-public class FileRes {
-
-    private Long id;
-
-    @ApiModelProperty(name = "现名称", example = "1")
-    private String name;
-
-    @ApiModelProperty(name = "原名称", example = "1")
-    private String originalName;
-
-    @ApiModelProperty(name = "后缀", example = "1")
-    private String suffix;
-
-    @ApiModelProperty(name = "访问路径", example = "1")
-    private String url;
-
-    @ApiModelProperty(name = "大小", example = "1")
-    private Long size;
-
-    @ApiModelProperty(name = "磁盘路径", example = "1")
-    private String diskPath;
-
-}

application-facade/src/main/java/com/factory/web/entity/vo/res/MenuRes.java

@@ -1,18 +0,0 @@
-package com.factory.web.entity.vo.res;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class MenuRes {
-
-    private String name;
-
-    private Long id;
-
-    private Long parentId;
-
-}

application-facade/src/main/java/com/factory/web/entity/vo/res/RoleListRes.java

@@ -1,26 +0,0 @@
-package com.factory.web.entity.vo.res;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * 角色列表
- *
- * @author JCM
- * @date 2021/5/13 18:21
- */
-@Data
-@ApiModel("角色列表")
-public class RoleListRes {
-
-    @ApiModelProperty("角色id")
-    private Long id;
-
-    @ApiModelProperty("角色名称")
-    private String name;
-
-    @ApiModelProperty("项目类型")
-    private String type;
-
-}

application-facade/src/main/java/com/factory/web/entity/vo/res/RoleRes.java

@@ -1,22 +0,0 @@
-package com.factory.web.entity.vo.res;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-public class RoleRes {
-
-    private Long id;
-
-    private String name;
-
-    private String securityName;
-
-    private String description;
-
-}

application-facade/src/main/java/com/factory/web/entity/vo/res/UserLogInRes.java

@@ -1,37 +0,0 @@
-package com.factory.web.entity.vo.res;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class UserLogInRes {
-
-    private Long id;
-
-    private String nickname;
-
-    private String realName;
-
-    private String username;
-
-    private String phone;
-
-    private String email;
-
-    private String headId;
-
-    private String url;
-
-    private List<RoleRes> roleList=new ArrayList<>();
-
-    private List<MenuRes> menuList=new ArrayList<>();
-
-    private List<ButtonRes> buttonList = new ArrayList<>();
-
-}

application-facade/src/main/java/com/factory/web/entity/vo/res/UserMenuRes.java

@@ -1,23 +0,0 @@
-package com.factory.web.entity.vo.res;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * 获取当前用户按钮权限
- *
- * @author JCM
- * @date 2021/4/19 18:44
- */
-@Data
-@ApiModel("获取当前用户按钮权限")
-public class UserMenuRes {
-
-    @ApiModelProperty("按钮名称")
-    private String name;
-
-    @ApiModelProperty("按钮权限")
-    private String url;
-
-}

application-facade/src/main/java/com/factory/web/entity/vo/res/UserRes.java

@@ -1,39 +0,0 @@
-package com.factory.web.entity.vo.res;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@ApiModel("用户列表")
-public class UserRes {
-
-    @ApiModelProperty("用户id")
-    private Long id;
-
-    @ApiModelProperty("账户名称")
-    private String username;
-
-    @ApiModelProperty("角色id")
-    private Long roleId;
-
-    @ApiModelProperty("角色名称")
-    private String roleName;
-
-    @ApiModelProperty("班次id")
-    private Long shiftId;
-
-    @ApiModelProperty("班次名称")
-    private String shiftName;
-
-    @ApiModelProperty("密码")
-    private String passWord;
-
-    @ApiModelProperty("设置:false.解禁 true.禁用")
-    private boolean lock;
-
-}

application-facade/src/main/java/com/factory/web/entity/vo/res/benteler/PagePlanRes.java

@@ -1,51 +0,0 @@
-package com.factory.web.entity.vo.res.benteler;
-
-import com.factory.base.entity.vo.req.BaseIdReq;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.sql.Time;
-import java.time.LocalDateTime;
-
-/**
- * @program: intelligent-factory-service
- * @description:
- * @author: dl
- * @create: 05月19日 08时
- **/
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@JsonInclude()
-public class PagePlanRes extends BaseIdReq {
-    @ApiModelProperty("计划名称")
-    private String name;
-
-    @ApiModelProperty("责任人1")
-    private String principleOne;
-    @ApiModelProperty("责任人2")
-    private String principleTwo;
-
-
-    @ApiModelProperty("当前执行 检查状态 1待响应 2未响应 3已响应 4已完成")
-    private Integer checkStatus;
-
-
-    @ApiModelProperty(value = "提交时间")
-    private Time submitTime;
-
-
-    @ApiModelProperty(value = "创建时间", hidden = true)
-    private LocalDateTime createdTime;
-
-    @ApiModelProperty("是否禁用暂停")
-    private Boolean pauseFlag;
-
-
-
-}

application-facade/src/main/java/com/factory/web/entity/vo/res/versionApproveRes.java

@@ -1,11 +0,0 @@
-package com.factory.web.entity.vo.res;
-
-/**
- * @program: intelligent-factory-service
- * @description:
- * @author: dl
- * @create: 05月17日 19时
- **/
-public class versionApproveRes {
-
-}

application-facade/src/main/java/com/factory/web/entity/vo/upkeepJsonType/FileList.java

@@ -1,28 +0,0 @@
-/**
-  * Copyright 2021 json.cn 
-  */
-package com.factory.web.entity.vo.upkeepJsonType;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * Auto-generated: 2021-04-20 14:32:31
- *
- * @author json.cn (i@json.cn)
- * @website http://www.json.cn/java2pojo/
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-
-public class FileList {
-
-    private int id;
-    private String url;
-
-
-}

application-facade/src/main/java/com/factory/web/entity/vo/upkeepJsonType/HeadType.java

@@ -1,35 +0,0 @@
-package com.factory.web.entity.vo.upkeepJsonType;
-
-import com.alibaba.excel.annotation.ExcelIgnore;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.annotation.write.style.ColumnWidth;
-import com.alibaba.excel.annotation.write.style.ContentRowHeight;
-import com.alibaba.excel.annotation.write.style.HeadRowHeight;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Date;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@ColumnWidth(25)
-@HeadRowHeight(40)
-@ContentRowHeight(40)
-public class HeadType {
-    @ExcelProperty("模具工作号")
-    private String string;
-    @ExcelProperty("日期标题")
-    private Date date;
-    @ExcelProperty("模具号")
-    private Double doubleData;
-    /**
-     * 忽略这个字段
-     */
-    @ExcelIgnore
-    private String ignore;
-
-}

application-facade/src/main/java/com/factory/web/entity/vo/upkeepJsonType/TestFileUtil.java

@@ -1,36 +0,0 @@
-package com.factory.web.entity.vo.upkeepJsonType;
-
-import java.io.File;
-import java.io.InputStream;
-
-public class TestFileUtil {
-
-
-    public static InputStream getResourcesFileInputStream(String fileName) {
-        return Thread.currentThread().getContextClassLoader().getResourceAsStream("" + fileName);
-    }
-
-    public static String getPath() {
-        return TestFileUtil.class.getResource("/").getPath();
-    }
-
-    public static File createNewFile(String pathName) {
-        File file = new File(getPath() + pathName);
-        if (file.exists()) {
-            file.delete();
-        } else {
-            if (!file.getParentFile().exists()) {
-                file.getParentFile().mkdirs();
-            }
-        }
-        return file;
-    }
-
-    public static File readFile(String pathName) {
-        return new File(getPath() + pathName);
-    }
-
-    public static File readUserHomeFile(String pathName) {
-        return new File(System.getProperty("user.home") + File.separator + pathName);
-    }
-}

application-facade/src/main/java/com/factory/web/entity/vo/upkeepJsonType/Type1.java

@@ -1,70 +0,0 @@
-/**
-  * Copyright 2021 json.cn 
-  */
-package com.factory.web.entity.vo.upkeepJsonType;
-
-import com.alibaba.excel.annotation.ExcelIgnore;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.annotation.write.style.ColumnWidth;
-import com.alibaba.excel.annotation.write.style.ContentRowHeight;
-import com.alibaba.excel.annotation.write.style.HeadRowHeight;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * Auto-generated: 2021-04-16 12:39:32
- *
- * @author json.cn (i@json.cn)
- * @website http://www.json.cn/java2pojo/
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@HeadRowHeight(40)
-@ContentRowHeight(40)
-public class Type1 {
-    //目视检查
-    @ExcelProperty(index = 0 ,value = "检查项目")
-    private String methodValue;
-    //氮气缸
-    @ExcelProperty(index = 1,value = "检查项目")
-    private String projectValue;
-    //压力值
-    @ExcelProperty(index = 2,value = "检查内容描述")
-    private String checkContentValue;
-    @ExcelProperty(index = 3,value = "维修内容")
-    private String fixvalue;
-    @ColumnWidth(10)
-    @ExcelProperty(index = 4,value = "点检状态")
-    private String status;
-    @ExcelProperty(index = 5,value = "备注")
-    private String markValue;
-
-
-    @ExcelIgnore
-    private String type;
-    @ExcelIgnore
-    private String title;
-    //检查项目
-    @ExcelIgnore
-    private String projectName;
-    //检查方法
-    @ExcelIgnore
-    private String methodName;
-    //检查内容
-    @ExcelIgnore
-    private String checkContentName;
-    //维修内容
-    @ExcelIgnore
-    private String fixName;
-    //备注
-    @ExcelIgnore
-    private String markName;
-
-
-
-
-}

application-facade/src/main/java/com/factory/web/entity/vo/upkeepJsonType/Type2.java

@@ -1,41 +0,0 @@
-/**
-  * Copyright 2021 json.cn 
-  */
-package com.factory.web.entity.vo.upkeepJsonType;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.annotation.write.style.ColumnWidth;
-import com.alibaba.excel.annotation.write.style.ContentRowHeight;
-import com.alibaba.excel.annotation.write.style.HeadRowHeight;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * Auto-generated: 2021-04-16 13:33:55
- *
- * @author json.cn (i@json.cn)
- * @website http://www.json.cn/java2pojo/
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@ColumnWidth(25)
-@HeadRowHeight(40)
-@ContentRowHeight(40)
-public class Type2 {
-    @ExcelProperty(value = "down机处理/维护内容")
-    private String title;
-    @ExcelProperty(value = "down机处理/维护内容")
-    private String blank;
-    private String issuename;
-    private String issuevalue;
-
-    @ExcelProperty(value = "down机处理/维护内容")
-    private String blank1;
-    @ExcelProperty(value = "down机处理/维护内容")
-    private String blank2;
-
-}

application-facade/src/main/java/com/factory/web/entity/vo/upkeepJsonType/Type3.java

@@ -1,58 +0,0 @@
-/**
-  * Copyright 2021 json.cn 
-  */
-package com.factory.web.entity.vo.upkeepJsonType;
-
-import com.alibaba.excel.annotation.ExcelIgnore;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.annotation.write.style.ColumnWidth;
-import com.alibaba.excel.annotation.write.style.ContentRowHeight;
-import com.alibaba.excel.annotation.write.style.HeadRowHeight;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * Auto-generated: 2021-04-16 13:35:18
- *
- * @author json.cn (i@json.cn)
- * @website http://www.json.cn/java2pojo/
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@ColumnWidth(25)
-@HeadRowHeight(40)
-@ContentRowHeight(40)
-public class Type3 {
-    @ExcelProperty(value = "保养项目")
-    private String projectUpkeepValue;
-    @ExcelProperty(value = "保养项目")
-    private String blank;
-    @ExcelProperty(value = "保养内容描述")
-    private String keepValue;
-    @ExcelProperty(value = "保养内容描述")
-    private String blank1;
-    @ColumnWidth(10)
-    @ExcelProperty(value = "点检状态")
-    private String status;
-    @ExcelProperty(value = "备注")
-    private String markValue;
-
-
-
-
-    @ExcelIgnore
-    private String title;
-    @ExcelIgnore
-    private String projectUpkeepName;
-    @ExcelIgnore
-    private String keepName;
-    @ExcelIgnore
-    private String markName;
-    @ExcelIgnore
-    private String type;
-
-}

application-facade/src/main/java/com/factory/web/entity/vo/upkeepJsonType/Type4.java

@@ -1,39 +0,0 @@
-/**
- * Copyright 2021 json.cn
- */
-package com.factory.web.entity.vo.upkeepJsonType;
-
-import com.alibaba.excel.annotation.ExcelIgnore;
-import com.alibaba.excel.annotation.write.style.ColumnWidth;
-import com.alibaba.excel.annotation.write.style.ContentRowHeight;
-import com.alibaba.excel.annotation.write.style.HeadRowHeight;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * Auto-generated: 2021-04-16 13:35:37
- *
- * @author json.cn (i@json.cn)
- * @website http://www.json.cn/java2pojo/
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@ColumnWidth(25)
-@HeadRowHeight(40)
-@ContentRowHeight(40)
-public class Type4 {
-    @ExcelIgnore
-    private String type;
-    private String key;
-    private String blank;
-    private String value;
-    private String blank1;
-    private String blank2;
-    private String blank3;
-
-
-}

application-facade/src/main/java/com/factory/web/entity/vo/upkeepJsonType/Type5.java

@@ -1,58 +0,0 @@
-/**
-  * Copyright 2021 json.cn 
-  */
-package com.factory.web.entity.vo.upkeepJsonType;
-
-import com.alibaba.excel.annotation.ExcelIgnore;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.annotation.write.style.ColumnWidth;
-import com.alibaba.excel.annotation.write.style.ContentRowHeight;
-import com.alibaba.excel.annotation.write.style.HeadRowHeight;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * Auto-generated: 2021-04-16 13:35:18
- *
- * @author json.cn (i@json.cn)
- * @website http://www.json.cn/java2pojo/
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@ColumnWidth(25)
-@HeadRowHeight(40)
-@ContentRowHeight(40)
-public class Type5 {
-    @ExcelProperty(value = "注意事项")
-    private String projectUpkeepValue;
-    @ExcelProperty(value = "注意事项")
-    private String blank;
-    @ExcelProperty(value = "注意事项")
-    private String keepValue;
-    @ExcelProperty(value = "注意事项")
-    private String blank1;
-    @ColumnWidth(10)
-    @ExcelProperty(value = "点检状态")
-    private String status;
-    @ExcelProperty(value = "备注")
-    private String markValue;
-
-
-
-
-    @ExcelIgnore
-    private String title;
-    @ExcelIgnore
-    private String projectUpkeepName;
-    @ExcelIgnore
-    private String keepName;
-    @ExcelIgnore
-    private String markName;
-    @ExcelIgnore
-    private String type;
-
-}

application-facade/src/main/java/com/factory/web/entity/vo/upkeepJsonType/Type6.java

@@ -1,42 +0,0 @@
-/**
-  * Copyright 2021 json.cn 
-  */
-package com.factory.web.entity.vo.upkeepJsonType;
-
-import com.alibaba.excel.annotation.write.style.ColumnWidth;
-import com.alibaba.excel.annotation.write.style.ContentRowHeight;
-import com.alibaba.excel.annotation.write.style.HeadRowHeight;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * Auto-generated: 2021-04-16 13:35:18
- *
- * @author json.cn (i@json.cn)
- * @website http://www.json.cn/java2pojo/
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@ColumnWidth(25)
-@HeadRowHeight(40)
-@ContentRowHeight(40)
-public class Type6 {
-    private String mouldNameTitle;
-    private String mouldName;
-    private String blank1;
-
-    private String mouldcodeTitle;
-    private String mouldcode;
-    private String blank;
-
-
-
-
-
-
-
-}

application-facade/src/main/java/com/factory/web/entity/vo/upkeepJsonType/Type7.java

@@ -1,45 +0,0 @@
-/**
-  * Copyright 2021 json.cn 
-  */
-package com.factory.web.entity.vo.upkeepJsonType;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.annotation.write.style.ColumnWidth;
-import com.alibaba.excel.annotation.write.style.ContentRowHeight;
-import com.alibaba.excel.annotation.write.style.HeadRowHeight;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * Auto-generated: 2021-04-16 13:35:18
- *
- * @author json.cn (i@json.cn)
- * @website http://www.json.cn/java2pojo/
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@ColumnWidth(25)
-@HeadRowHeight(40)
-@ContentRowHeight(40)
-public class Type7 {
-
-    private String explain;
-    private String blank1;
-    @ExcelProperty(index = 2)
-    private String personnelTitle;
-    private String personnel;
-    private String dateTitle;
-    @ExcelProperty(index = 5)
-    private String date;
-
-
-
-
-
-
-
-}

application-facade/src/main/java/com/factory/web/entity/vo/upkeepJsonType/TypeOne.java

@@ -1,65 +0,0 @@
-/**
-  * Copyright 2021 json.cn 
-  */
-package com.factory.web.entity.vo.upkeepJsonType;
-
-import com.alibaba.excel.annotation.ExcelIgnore;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.annotation.write.style.ColumnWidth;
-import com.alibaba.excel.annotation.write.style.ContentRowHeight;
-import com.alibaba.excel.annotation.write.style.HeadRowHeight;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-/**
- * Auto-generated: 2021-04-20 14:32:31
- *
- * @author json.cn (i@json.cn)
- * @website http://www.json.cn/java2pojo/
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@ColumnWidth(25)
-@HeadRowHeight(40)
-@ContentRowHeight(40)
-public class TypeOne {
-
-    @ExcelIgnore
-    private String type;
-    @ExcelIgnore
-    private String title;
-    @ExcelIgnore
-    private String methodName;
-    @ExcelIgnore
-    private String projectName;
-    @ExcelIgnore
-    private String checkContentName;
-    @ExcelIgnore
-    private String fixName;
-    @ExcelIgnore
-    private String markName;
-    @ExcelIgnore
-    private List<FileList> fileList;
-
-
-    @ExcelProperty("区分")
-    private String projectValue;
-    @ExcelProperty("检查项目")
-    private String methodValue;
-    @ExcelProperty("内容描述")
-    private String checkContentValue;
-    @ExcelProperty("整改工作内容")
-    private String fixvalue;
-    @ExcelProperty("备注")
-    private String markValue;
-    @ExcelProperty("状态")
-    private String status;
-
-
-}

application-facade/src/main/java/com/factory/web/entity/vo/upkeepJsonType/WidthAndHeightData.java

@@ -1,16 +0,0 @@
-package com.factory.web.entity.vo.upkeepJsonType;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.annotation.write.style.ColumnWidth;
-import com.alibaba.excel.annotation.write.style.ContentRowHeight;
-import com.alibaba.excel.annotation.write.style.HeadRowHeight;
-import lombok.Data;
-
-@Data
-@ContentRowHeight(20)
-@HeadRowHeight(20)
-@ColumnWidth(25)
-public class WidthAndHeightData {
-    @ExcelProperty("字符串标题")
-    private String string;
-}

application-facade/src/main/java/com/factory/web/mapper/benteler/BentelerIniCheckItemMapper.java

@@ -1,17 +0,0 @@
-package com.factory.web.mapper.benteler;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.factory.base.entity.po.benteler.BentelerIniCheckItem;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 记录检查结果 - 分类结果 - 单一检查项结果
- * 
- * @author chenshun
- * @email sunlightcs@gmail.com
- * @date 2021-06-26 12:35:17
- */
-@Mapper
-public interface BentelerIniCheckItemMapper extends BaseMapper<BentelerIniCheckItem> {
-	
-}

application-facade/src/main/java/com/factory/web/mapper/benteler/BentelerIniCheckResultMapper.java

@@ -1,17 +0,0 @@
-package com.factory.web.mapper.benteler;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.factory.base.entity.po.benteler.BentelerIniCheckResult;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 检查记录
- * 
- * @author chenshun
- * @email sunlightcs@gmail.com
- * @date 2021-06-26 12:35:17
- */
-@Mapper
-public interface BentelerIniCheckResultMapper extends BaseMapper<BentelerIniCheckResult> {
-	
-}

application-facade/src/main/java/com/factory/web/mapper/benteler/BentelerIniCheckTypeMapper.java

@@ -1,17 +0,0 @@
-package com.factory.web.mapper.benteler;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.factory.base.entity.po.benteler.BentelerIniCheckType;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 计划 - 检验结果
- * 
- * @author chenshun
- * @email sunlightcs@gmail.com
- * @date 2021-06-26 12:35:17
- */
-@Mapper
-public interface BentelerIniCheckTypeMapper extends BaseMapper<BentelerIniCheckType> {
-	
-}

application-facade/src/main/java/com/factory/web/mapper/benteler/BentelerIniVersionItemMapper.java

@@ -1,17 +0,0 @@
-package com.factory.web.mapper.benteler;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.factory.base.entity.po.benteler.BentelerIniVersionItem;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 计划 - 检查项
- * 
- * @author chenshun
- * @email sunlightcs@gmail.com
- * @date 2021-06-26 12:35:17
- */
-@Mapper
-public interface BentelerIniVersionItemMapper extends BaseMapper<BentelerIniVersionItem> {
-	
-}

application-facade/src/main/java/com/factory/web/mapper/benteler/BentelerIniVersionMapper.java

@@ -1,23 +0,0 @@
-package com.factory.web.mapper.benteler;
-
-import com.factory.web.entity.vo.res.benteler.PagePlanRes;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.factory.base.entity.po.benteler.BentelerIniVersion;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 计划 - 版本信息
- * 
- * @author chenshun
- * @email sunlightcs@gmail.com
- * @date 2021-06-26 12:35:17
- */
-@Mapper
-public interface BentelerIniVersionMapper extends BaseMapper<BentelerIniVersion> {
-    List<PagePlanRes> pageIniPlan(@Param("page") Page page);
-	
-}

application-facade/src/main/java/com/factory/web/mapper/benteler/BentelerPlanMapper.java

@@ -1,17 +0,0 @@
-package com.factory.web.mapper.benteler;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.factory.base.entity.po.benteler.BentelerPlan;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 本特勒检测计划
- * 
- * @author chenshun
- * @email sunlightcs@gmail.com
- * @date 2021-06-26 12:35:17
- */
-@Mapper
-public interface BentelerPlanMapper extends BaseMapper<BentelerPlan> {
-	
-}

application-facade/src/main/java/com/factory/web/service/benteler/BentelerIniCheckItemService.java

@@ -1,16 +0,0 @@
-package com.factory.web.service.benteler;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.factory.base.entity.po.benteler.BentelerIniCheckItem;
-
-/**
- * 记录检查结果 - 分类结果 - 单一检查项结果
- *
- * @author chenshun
- * @email sunlightcs@gmail.com
- * @date 2021-06-26 12:35:17
- */
-public interface BentelerIniCheckItemService extends IService<BentelerIniCheckItem> {
-
-}
-

application-facade/src/main/java/com/factory/web/service/benteler/BentelerIniCheckResultService.java

@@ -1,16 +0,0 @@
-package com.factory.web.service.benteler;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.factory.base.entity.po.benteler.BentelerIniCheckResult;
-
-/**
- * 检查记录
- *
- * @author chenshun
- * @email sunlightcs@gmail.com
- * @date 2021-06-26 12:35:17
- */
-public interface BentelerIniCheckResultService extends IService<BentelerIniCheckResult> {
-
-}
-

application-facade/src/main/java/com/factory/web/service/benteler/BentelerIniCheckTypeService.java

@@ -1,16 +0,0 @@
-package com.factory.web.service.benteler;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.factory.base.entity.po.benteler.BentelerIniCheckType;
-
-/**
- * 计划 - 检验结果
- *
- * @author chenshun
- * @email sunlightcs@gmail.com
- * @date 2021-06-26 12:35:17
- */
-public interface BentelerIniCheckTypeService extends IService<BentelerIniCheckType> {
-
-}
-

application-facade/src/main/java/com/factory/web/service/benteler/BentelerIniVersionItemService.java

@@ -1,16 +0,0 @@
-package com.factory.web.service.benteler;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.factory.base.entity.po.benteler.BentelerIniVersionItem;
-
-/**
- * 计划 - 检查项
- *
- * @author chenshun
- * @email sunlightcs@gmail.com
- * @date 2021-06-26 12:35:17
- */
-public interface BentelerIniVersionItemService extends IService<BentelerIniVersionItem> {
-
-}
-

application-facade/src/main/java/com/factory/web/service/benteler/BentelerIniVersionService.java

@@ -1,50 +0,0 @@
-package com.factory.web.service.benteler;
-
-import com.factory.base.entity.aggregates.ResponseBean;
-import com.factory.base.entity.po.benteler.BentelerIniVersion;
-import com.factory.base.entity.vo.req.BaseIdReq;
-import com.factory.web.entity.vo.res.FileRes;
-import com.factory.web.entity.vo.res.versionApproveRes;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.factory.web.entity.vo.res.benteler.PagePlanRes;
-
-/**
- * 计划 - 版本信息
- *
- * @author chenshun
- * @email sunlightcs@gmail.com
- * @date 2021-06-26 12:35:17
- */
-public interface BentelerIniVersionService extends IService<BentelerIniVersion> {
-
-    //ResponseBean<FileRes> exportInitialPlan(exportInitialPlanReq req);
-    //
-    //ResponseBean addVersion(AddPlanReq params);
-    //
-    //ResponseBean<AddPlanReq> getOneVersionDetails(BaseIdReq baseIdReq);
-    //
-    //ResponseBean updatePlanVersion(AddPlanReq params);
-    //
-    //ResponseBean<AddPlanReq> getOneUNAUDITVersionDetails(BaseIdReq baseIdReq);
-    //
-    //ResponseBean<PageBean<GetVersionHistoryRes>> getVersionHistory(BasePageIdReq req);
-    //
-    //ResponseBean<GetVersionBaseRes> getVersionBase(BaseIdReq req);
-    //
-    //ResponseBean<PageBean<GetVersionSubRes>> getVersionSub(BasePageIdReq req);
-    //
-    //ResponseBean<PageBean<versionApproveRes>> versionApprove(versionApproveReq req);
-    //
-    //ResponseBean<PlanVersion> getVersionSubGread(getVersionSubGreadReq req);
-    //
-    //ResponseBean<PlanVersion> getHistoryVersionSubGread(getVersionSubGreadReq req);
-    //
-    //ResponseBean<getAuditRecordRes> getAuditRecord(getAuditRecordReq req);
-    //
-    //ResponseBean addPlan(AddPlanReq params);
-    //
-    //ResponseBean<PageBean<UnAuditRes>> unAuditList(unAuditReq params);
-    //
-    //ResponseBean<PageBean<PagePlanRes>> pagePlan(PlanListReq params);
-}
-

application-facade/src/main/java/com/factory/web/service/benteler/BentelerPlanService.java

@@ -1,18 +0,0 @@
-package com.factory.web.service.benteler;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.factory.base.entity.po.benteler.BentelerPlan;
-
-/**
- * 本特勒检测计划
- *
- * @author chenshun
- * @email sunlightcs@gmail.com
- * @date 2021-06-26 12:35:17
- */
-public interface BentelerPlanService extends IService<BentelerPlan> {
-
-
-}
-

application-facade/src/main/java/com/factory/web/service/impl/benteler/BentelerIniCheckItemServiceImpl.java

@@ -1,16 +0,0 @@
-package com.factory.web.service.impl.benteler;
-
-import com.factory.base.entity.po.benteler.BentelerIniCheckItem;
-import com.factory.web.service.benteler.BentelerIniCheckItemService;
-import com.factory.web.mapper.benteler.BentelerIniCheckItemMapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-
-@Service("bentelerIniCheckItemService")
-@Transactional(rollbackFor = Exception.class)
-public class BentelerIniCheckItemServiceImpl extends ServiceImpl<BentelerIniCheckItemMapper, BentelerIniCheckItem> implements BentelerIniCheckItemService {
-
-
-}

application-facade/src/main/java/com/factory/web/service/impl/benteler/BentelerIniCheckResultServiceImpl.java

@@ -1,16 +0,0 @@
-package com.factory.web.service.impl.benteler;
-
-import com.factory.base.entity.po.benteler.BentelerIniCheckResult;
-import com.factory.web.service.benteler.BentelerIniCheckResultService;
-import com.factory.web.mapper.benteler.BentelerIniCheckResultMapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-
-@Service("bentelerIniCheckResultService")
-@Transactional(rollbackFor = Exception.class)
-public class BentelerIniCheckResultServiceImpl extends ServiceImpl<BentelerIniCheckResultMapper, BentelerIniCheckResult> implements BentelerIniCheckResultService {
-
-
-}

application-facade/src/main/java/com/factory/web/service/impl/benteler/BentelerIniCheckTypeServiceImpl.java

@@ -1,16 +0,0 @@
-package com.factory.web.service.impl.benteler;
-
-import com.factory.web.service.benteler.BentelerIniCheckTypeService;
-import com.factory.web.mapper.benteler.BentelerIniCheckTypeMapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.factory.base.entity.po.benteler.BentelerIniCheckType;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-
-@Service("bentelerIniCheckTypeService")
-@Transactional(rollbackFor = Exception.class)
-public class BentelerIniCheckTypeServiceImpl extends ServiceImpl<BentelerIniCheckTypeMapper, BentelerIniCheckType> implements BentelerIniCheckTypeService {
-
-
-}

application-facade/src/main/java/com/factory/web/service/impl/benteler/BentelerIniVersionItemServiceImpl.java

@@ -1,16 +0,0 @@
-package com.factory.web.service.impl.benteler;
-
-import com.factory.web.service.benteler.BentelerIniVersionItemService;
-import com.factory.web.mapper.benteler.BentelerIniVersionItemMapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.factory.base.entity.po.benteler.BentelerIniVersionItem;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-
-@Service("bentelerIniVersionItemService")
-@Transactional(rollbackFor = Exception.class)
-public class BentelerIniVersionItemServiceImpl extends ServiceImpl<BentelerIniVersionItemMapper, BentelerIniVersionItem> implements BentelerIniVersionItemService {
-
-
-}

application-facade/src/main/java/com/factory/web/service/impl/benteler/BentelerIniVersionServiceImpl.java

@@ -1,113 +0,0 @@
-package com.factory.web.service.impl.benteler;
-
-import com.factory.base.entity.po.benteler.BentelerIniVersion;
-import com.factory.web.service.benteler.BentelerIniVersionService;
-import com.factory.web.mapper.benteler.BentelerIniVersionMapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-
-@Service("bentelerIniVersionService")
-@Transactional(rollbackFor = Exception.class)
-public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersionMapper, BentelerIniVersion> implements BentelerIniVersionService {
-
-    //@Autowired
-    //private BentelerPlanService planService;
-    //@Autowired
-    //private BentelerIniVersionMapper versionMapper;
-    //
-    //@Override
-    //public ResponseBean<FileRes> exportInitialPlan(exportInitialPlanReq req) {
-    //    return null;
-    //}
-    //
-    //@Override
-    //public ResponseBean addVersion(AddPlanReq params) {
-    //    return null;
-    //}
-    //
-    //@Override
-    //public ResponseBean<AddPlanReq> getOneVersionDetails(BaseIdReq baseIdReq) {
-    //    return null;
-    //}
-    //
-    //@Override
-    //public ResponseBean updatePlanVersion(AddPlanReq params) {
-    //    return null;
-    //}
-    //
-    //@Override
-    //public ResponseBean<AddPlanReq> getOneUNAUDITVersionDetails(BaseIdReq baseIdReq) {
-    //    return null;
-    //}
-    //
-    //@Override
-    //public ResponseBean<PageBean<GetVersionHistoryRes>> getVersionHistory(BasePageIdReq req) {
-    //    return null;
-    //}
-    //
-    //@Override
-    //public ResponseBean<GetVersionBaseRes> getVersionBase(BaseIdReq req) {
-    //    return null;
-    //}
-    //
-    //@Override
-    //public ResponseBean<PageBean<GetVersionSubRes>> getVersionSub(BasePageIdReq req) {
-    //    return null;
-    //}
-    //
-    //@Override
-    //public ResponseBean<PageBean<versionApproveRes>> versionApprove(versionApproveReq req) {
-    //    return null;
-    //}
-    //
-    //@Override
-    //public ResponseBean<PlanVersion> getVersionSubGread(getVersionSubGreadReq req) {
-    //    return null;
-    //}
-    //
-    //@Override
-    //public ResponseBean<PlanVersion> getHistoryVersionSubGread(getVersionSubGreadReq req) {
-    //    return null;
-    //}
-    //
-    //@Override
-    //public ResponseBean<getAuditRecordRes> getAuditRecord(getAuditRecordReq req) {
-    //    return null;
-    //}
-    //
-    //@Override
-    //public ResponseBean addPlan(AddPlanReq params) {
-    //    return null;
-    //}
-    //
-    //@Override
-    //public ResponseBean<PageBean<UnAuditRes>> unAuditList(unAuditReq params) {
-    //    return null;
-    //}
-    //
-    //@Override
-    //public ResponseBean<PageBean<PagePlanRes>> pagePlan(PlanListReq params) {
-    //    Page<PagePlanRes> page = new Page<PagePlanRes>(params.getPage(), params.getSize());
-    //
-    //    List<PagePlanRes> pagePlanRes = versionMapper.pageIniPlan(page);
-    //    return ResponseBeanBuilder.ok();
-    //}
-    //
-    ////获取未禁用首件计划
-    //private List<BentelerPlan> getUnDisablePlan() {
-    //    return planService.list(Wrappers.<BentelerPlan>lambdaQuery()
-    //            .eq(BentelerPlan::getPauseFlag, 0)
-    //            .eq(BentelerPlan::getCheckType, 1)
-    //    );
-    //}
-    //
-    ////获取未禁用首件计划ID
-    //private List<Long> getUnDisablePlanId() {
-    //    return planService.list(Wrappers.<BentelerPlan>lambdaQuery()
-    //            .eq(BentelerPlan::getPauseFlag, 0)
-    //            .eq(BentelerPlan::getCheckType, 1)
-    //    ).stream().map(BentelerPlan::getId).collect(Collectors.toList());
-    //}
-}

application-facade/src/main/java/com/factory/web/service/impl/benteler/BentelerPlanServiceImpl.java

@@ -1,16 +0,0 @@
-package com.factory.web.service.impl.benteler;
-
-import com.factory.base.entity.po.benteler.BentelerPlan;
-import com.factory.web.service.benteler.BentelerPlanService;
-import com.factory.web.mapper.benteler.BentelerPlanMapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-@Service("bentelerPlanService")
-@Transactional(rollbackFor = Exception.class)
-public class BentelerPlanServiceImpl
-        extends ServiceImpl<BentelerPlanMapper, BentelerPlan> implements BentelerPlanService {
-
-
-}

application-facade/src/main/java/com/factory/web/service/impl/remote/DeptServiceImpl.java

@@ -1,43 +0,0 @@
-package com.factory.web.service.impl.remote;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.factory.base.entity.constant.res.SystemConstant;
-import com.factory.base.entity.po.remote.Dept;
-import com.factory.user.mapper.DeptMapper;
-import com.factory.web.service.remote.DeptService;
-import org.springframework.stereotype.Service;
-
-@Service("WebDeptService")
-public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements DeptService {
-
-    @Override
-    public String getDeptNameById(Long id) {
-        String name = SystemConstant.EMPTY_STRING;
-        if (id == null) {
-            return name;
-        }
-        Dept dept = getById(id);
-        if (dept != null) {
-            name = dept.getName();
-        }
-        return name;
-    }
-
-    @Override
-    public String getDeptNameByCode(Long code) {
-        String name = SystemConstant.EMPTY_STRING;
-        if (code == null) {
-            return name;
-        }
-        Dept dept = getOne(Wrappers.<Dept>lambdaQuery()
-                .eq(Dept::getDeptCode,code),false
-
-        );
-        if (dept != null) {
-            name = dept.getName();
-        }
-        return name;
-    }
-
-}

application-facade/src/main/java/com/factory/web/service/impl/remote/DictServiceImpl.java

@@ -1,26 +0,0 @@
-package com.factory.web.service.impl.remote;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.factory.base.entity.constant.res.SystemConstant;
-import com.factory.base.entity.po.remote.Dict;
-import com.factory.user.mapper.DictMapper;
-import com.factory.web.service.remote.DictService;
-import org.springframework.stereotype.Service;
-
-@Service("WebDictService")
-public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements DictService {
-
-    @Override
-    public String getNameById(Long id) {
-        String name = SystemConstant.EMPTY_STRING;
-        if (id == null) {
-            return name;
-        }
-        Dict dept = getById(id);
-        if (dept != null) {
-            name = dept.getDictVal();
-        }
-        return name;
-    }
-
-}

application-facade/src/main/java/com/factory/web/service/impl/remote/FileInfoServiceImpl.java

@@ -1,37 +0,0 @@
-package com.factory.web.service.impl.remote;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.factory.base.entity.constant.res.SystemConstant;
-import com.factory.base.entity.po.file.FileInfo;
-import com.factory.user.mapper.FileInfoMapper;
-import com.factory.web.service.remote.FileInfoService;
-import com.factory.web.util.assembler.WebFileInfoAssembler;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-
-/**
- * 考虑独立文件服务器 暂时采用多数据源读库 后续按需求修改
- */
-
-@DS("file")
-@Service("WebFileInfoService")
-@Transactional(propagation = Propagation.REQUIRES_NEW)
-public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> implements FileInfoService {
-
-    @Resource
-    private WebFileInfoAssembler webFileInfoAssembler;
-
-    @Override
-    public String getUrlById(Long fileInfoId) {
-        if (fileInfoId == null) {
-            return SystemConstant.EMPTY_STRING;
-        }
-        FileInfo fileInfo = getById(fileInfoId);
-        return webFileInfoAssembler.getUrlByFileInfo(fileInfo);
-    }
-
-}

application-facade/src/main/java/com/factory/web/service/impl/remote/MenuServiceImpl.java

@@ -1,11 +0,0 @@
-package com.factory.web.service.impl.remote;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.factory.base.entity.po.remote.Menu;
-import com.factory.user.mapper.MenuMapper;
-import com.factory.web.service.remote.MenuService;
-import org.springframework.stereotype.Service;
-
-@Service("WebMenuService")
-public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements MenuService {
-}

application-facade/src/main/java/com/factory/web/service/impl/remote/PermissionServiceImpl.java

@@ -1,12 +0,0 @@
-package com.factory.web.service.impl.remote;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.factory.base.entity.po.remote.Permission;
-import com.factory.user.mapper.PermissionMapper;
-import com.factory.web.service.remote.PermissionService;
-import org.springframework.stereotype.Service;
-
-@Service("WebPermissionService")
-public class PermissionServiceImpl extends ServiceImpl<PermissionMapper, Permission> implements PermissionService {
-
-}

application-facade/src/main/java/com/factory/web/service/impl/remote/RolePermissionServiceImpl.java

@@ -1,12 +0,0 @@
-package com.factory.web.service.impl.remote;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.factory.base.entity.po.remote.RolePermission;
-import com.factory.user.mapper.RolePermissionMapper;
-import com.factory.web.service.remote.RolePermissionService;
-import org.springframework.stereotype.Service;
-
-@Service("WebRolePermissionService")
-public class RolePermissionServiceImpl extends ServiceImpl<RolePermissionMapper, RolePermission> implements RolePermissionService {
-
-}

application-facade/src/main/java/com/factory/web/service/impl/remote/RoleServiceImpl.java

@@ -1,12 +0,0 @@
-package com.factory.web.service.impl.remote;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.factory.base.entity.po.remote.Role;
-import com.factory.user.mapper.RoleMapper;
-import com.factory.web.service.remote.RoleService;
-import org.springframework.stereotype.Service;
-
-@Service("WebRoleService")
-public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements RoleService {
-
-}

application-facade/src/main/java/com/factory/web/service/impl/remote/UserInfoServiceImpl.java

@@ -1,190 +0,0 @@
-package com.factory.web.service.impl.remote;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.factory.base.entity.aggregates.PageBean;
-import com.factory.base.entity.aggregates.ResponseBean;
-import com.factory.base.entity.constant.res.SystemConstant;
-import com.factory.base.entity.po.remote.Dict;
-import com.factory.base.entity.po.remote.Role;
-import com.factory.base.entity.po.remote.UserInfo;
-import com.factory.base.entity.po.remote.UserRole;
-import com.factory.base.util.res.ResponseBeanBuilder;
-import com.factory.user.mapper.DictMapper;
-import com.factory.user.mapper.RoleMapper;
-import com.factory.user.mapper.UserInfoMapper;
-import com.factory.user.mapper.UserRoleMapper;
-import com.factory.user.util.Base64;
-import com.factory.web.entity.vo.req.UserInsertReq;
-import com.factory.web.entity.vo.req.UserLockReq;
-import com.factory.web.entity.vo.req.UserPageQueryReq;
-import com.factory.web.entity.vo.res.UserRes;
-import com.factory.web.service.remote.UserInfoService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.stream.Collectors;
-
-@Service("WebUserInfoService")
-public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> implements UserInfoService {
-
-    @Resource
-    private UserRoleMapper userRoleMapper;
-    @Resource
-    private RoleMapper roleMapper;
-    @Resource
-    private DictMapper dictMapper;
-
-    @Override
-    public String getNameById(Long id) {
-        String name = SystemConstant.EMPTY_STRING;
-        if (id == null) {
-            return name;
-        }
-        UserInfo userInfo = getById(id);
-        if (userInfo != null) {
-            name = userInfo.getName();
-        }
-        return name;
-    }
-    @Override
-    public List<UserInfo> getListByNameOrNo(String word) {
-        return list(Wrappers.<UserInfo>lambdaQuery().like(UserInfo::getName, word).or().like(UserInfo::getNo, word));
-    }
-
-    @Override
-    public ResponseBean<PageBean<UserRes>> selectUser(UserPageQueryReq userPageQueryReq) {
-        LambdaQueryWrapper<UserInfo> wrapper = new LambdaQueryWrapper<>();
-        wrapper.orderByDesc(UserInfo::getId);
-        if (userPageQueryReq.getName() != null) {
-            wrapper.like(UserInfo::getUsername, userPageQueryReq.getName());
-        }
-        if (userPageQueryReq.getRoleId() != null) {
-            List<UserRole> userRoles = userRoleMapper.selectList(Wrappers.<UserRole>lambdaQuery().eq(UserRole::getRoleId, userPageQueryReq.getRoleId()));
-            if (CollUtil.isNotEmpty(userRoles)) {
-                List<Long> userIds = userRoles.stream().map(UserRole::getUserId).collect(Collectors.toList());
-                wrapper.in(UserInfo::getId, userIds);
-            }
-        }
-        IPage<UserInfo> page = new Page<>(userPageQueryReq.getPage(), userPageQueryReq.getSize());
-        IPage<UserInfo> userInfoPage = baseMapper.selectPage(page, wrapper);
-        List<UserInfo> records = userInfoPage.getRecords();
-        List<UserRes> userResList = records.stream().map(x -> {
-            UserRes userRes = new UserRes();
-            userRes.setId(x.getId());
-            userRes.setUsername(x.getUsername());
-            List<UserRole> userRoles = userRoleMapper.selectList(Wrappers.<UserRole>lambdaQuery().eq(UserRole::getUserId, x.getId()));
-            if (CollUtil.isNotEmpty(userRoles)) {
-                Role role = roleMapper.selectById(userRoles.get(0).getRoleId());
-                userRes.setRoleId(role.getId());
-                userRes.setRoleName(role.getName());
-            }
-            userRes.setShiftId(x.getShiftId());
-            if (x.getShiftId() != null) {
-                Dict dict = dictMapper.selectById(x.getShiftId());
-                if (dict != null) {
-                    userRes.setShiftName(dict.getDictVal());
-                }
-            }
-            String psd = new String(Base64.decode(x.getPassword()));
-            userRes.setPassWord(psd);
-            userRes.setLock(x.isLock());
-            return userRes;
-        }).collect(Collectors.toList());
-        return ResponseBeanBuilder.ok(PageBean.<UserRes>builder().row(userResList).total(userInfoPage.getTotal()).page(userInfoPage.getPages()).build());
-    }
-
-    @Override
-    public ResponseBean<String> insertUser(UserInsertReq userInsertReq) {
-        UserInfo userInfo = new UserInfo();
-        if (userInsertReq.getUsername() != null) {
-            Integer count = baseMapper.selectCount(Wrappers.<UserInfo>lambdaQuery().eq(UserInfo::getUsername, userInsertReq.getUsername()));
-            if (count > 0) {
-                return ResponseBeanBuilder.fail("用户名重复！");
-            }
-        } else {
-            return ResponseBeanBuilder.fail("用户名不能为空");
-        }
-        if (userInsertReq.getPassword() == null) {
-            return ResponseBeanBuilder.fail("密码不能为空");
-        }
-        if (userInsertReq.getRoleId() == 55) {
-            if (userInsertReq.getShiftId()==null){
-            return ResponseBeanBuilder.fail("班次不能为空");
-
-            }
-        }
-        userInfo.setUsername(userInsertReq.getUsername());
-        String psd = Base64.encode(userInsertReq.getPassword().getBytes());
-        userInfo.setPassword(psd);
-        userInfo.setEffectiveTime(LocalDateTime.now());
-        if (userInsertReq.getShiftId() != null) {
-            userInfo.setShiftId(userInsertReq.getShiftId());
-        }
-        int insert = baseMapper.insert(userInfo);
-        if (insert > 0) {
-            if (userInsertReq.getRoleId() != null) {
-                UserRole userRole = new UserRole();
-                userRole.setUserId(userInfo.getId());
-                userRole.setRoleId(userInsertReq.getRoleId());
-                userRoleMapper.insert(userRole);
-            }
-            return ResponseBeanBuilder.ok("新增成功!");
-        }
-        return ResponseBeanBuilder.ok("新增失败!");
-    }
-
-    @Override
-    public ResponseBean<String> updateUser(UserInsertReq userInsertReq) {
-        UserInfo userInfo = new UserInfo();
-        if (userInsertReq.getUsername() != null) {
-            UserInfo userInfos = baseMapper.selectOne(Wrappers.<UserInfo>lambdaQuery().eq(UserInfo::getUsername, userInsertReq.getUsername()));
-            if(BeanUtil.isNotEmpty(userInfos)){
-                if (!userInfos.getId().equals(userInsertReq.getId())) {
-                    return ResponseBeanBuilder.fail("用户名重复！");
-                }
-            }
-        } else {
-            return ResponseBeanBuilder.fail("用户名不能为空");
-        }
-        if (userInsertReq.getPassword() == null) {
-            return ResponseBeanBuilder.fail("密码不能为空");
-        }
-        userInfo.setUsername(userInsertReq.getUsername());
-        String psd = Base64.encode(userInsertReq.getPassword().getBytes());
-        userInfo.setPassword(psd);
-        userInfo.setShiftId(userInsertReq.getShiftId());
-        userInfo.setId(userInsertReq.getId());
-        int up = baseMapper.updateById(userInfo);
-        if (up > 0) {
-            if (userInsertReq.getRoleId() != null) {
-                UserRole userRole = new UserRole();
-                userRole.setRoleId(userInsertReq.getRoleId());
-                userRoleMapper.update(userRole, Wrappers.<UserRole>lambdaQuery().eq(UserRole::getUserId, userInsertReq.getId()));
-            }
-            return ResponseBeanBuilder.ok("修改成功!");
-        }
-        return ResponseBeanBuilder.ok("修改失败!");
-    }
-
-    @Override
-    public ResponseBean<String> userLock(UserLockReq userLockReq) {
-        UserInfo userInfo = new UserInfo();
-        userInfo.setId(userLockReq.getId());
-        userInfo.setLock(userLockReq.isNo());
-        userInfo.setShiftId(userLockReq.getShiftId());
-        boolean b = this.updateById(userInfo);
-        if (b) {
-            return ResponseBeanBuilder.ok("操作成功！");
-        }
-        return ResponseBeanBuilder.fail("操作失败！");
-    }
-
-}

application-facade/src/main/java/com/factory/web/service/impl/remote/UserRoleServiceImpl.java

@@ -1,35 +0,0 @@
-package com.factory.web.service.impl.remote;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.factory.base.entity.po.remote.UserRole;
-import com.factory.user.mapper.UserRoleMapper;
-import com.factory.web.service.remote.UserRoleService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-@Service("WebUserRoleService")
-public class UserRoleServiceImpl extends ServiceImpl<UserRoleMapper, UserRole> implements UserRoleService {
-
-    @Override
-    public boolean userHasRole(Long userId,Long roleId) {
-        return getRoleIdsByUserId(userId).contains(roleId);
-    }
-
-    @Override
-    public List<UserRole> getRolesByUserId(Long userId) {
-        List<UserRole> userRoleList = list(
-                Wrappers.<UserRole>lambdaQuery()
-                        .eq(UserRole::getUserId, userId));
-        return userRoleList;
-    }
-
-    @Override
-    public List<Long> getRoleIdsByUserId(Long userId) {
-        List<UserRole> userRoleList = getRolesByUserId(userId);
-        List<Long> roleIds = userRoleList.stream().map(UserRole::getRoleId).collect(Collectors.toList());
-        return roleIds;
-    }
-}

application-facade/src/main/java/com/factory/web/service/impl/remote/WorkStationServiceImpl.java

@@ -1,27 +0,0 @@
-package com.factory.web.service.impl.remote;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.factory.base.entity.constant.res.SystemConstant;
-import com.factory.base.entity.po.remote.Workstation;
-import com.factory.user.mapper.WorkstationMapper;
-import com.factory.web.service.remote.WorkStationService;
-import org.springframework.stereotype.Service;
-
-
-@Service("WebWorkStationService")
-public class WorkStationServiceImpl extends ServiceImpl<WorkstationMapper, Workstation> implements WorkStationService {
-
-    @Override
-    public String geNameById(Long id) {
-        String name = SystemConstant.EMPTY_STRING;
-        if (id == null) {
-            return name;
-        }
-        Workstation workstation = getById(id);
-        if (workstation != null) {
-            name = workstation.getName();
-        }
-        return name;
-    }
-
-}

application-facade/src/main/java/com/factory/web/service/remote/DeptService.java

@@ -1,11 +0,0 @@
-package com.factory.web.service.remote;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.factory.base.entity.po.remote.Dept;
-
-public interface DeptService extends IService<Dept> {
-
-     String getDeptNameById(Long id);
-
-     String getDeptNameByCode(Long code);
-}

application-facade/src/main/java/com/factory/web/service/remote/DictService.java

@@ -1,11 +0,0 @@
-package com.factory.web.service.remote;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.factory.base.entity.po.remote.Dict;
-
-public interface DictService extends IService<Dict> {
-
-    String getNameById(Long id);
-
-
-}

application-facade/src/main/java/com/factory/web/service/remote/FileInfoService.java

@@ -1,10 +0,0 @@
-package com.factory.web.service.remote;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.factory.base.entity.po.file.FileInfo;
-
-public interface FileInfoService extends IService<FileInfo> {
-
-    String getUrlById(Long fileInfoId);
-
-}

application-facade/src/main/java/com/factory/web/service/remote/MenuService.java

@@ -1,7 +0,0 @@
-package com.factory.web.service.remote;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.factory.base.entity.po.remote.Menu;
-
-public interface MenuService extends IService<Menu> {
-}

application-facade/src/main/java/com/factory/web/service/remote/PermissionService.java

@@ -1,8 +0,0 @@
-package com.factory.web.service.remote;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.factory.base.entity.po.remote.Permission;
-
-public interface PermissionService extends IService<Permission> {
-
-}

application-facade/src/main/java/com/factory/web/service/remote/RolePermissionService.java

@@ -1,8 +0,0 @@
-package com.factory.web.service.remote;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.factory.base.entity.po.remote.RolePermission;
-
-public interface RolePermissionService extends IService<RolePermission> {
-
-}

application-facade/src/main/java/com/factory/web/service/remote/RoleService.java

@@ -1,9 +0,0 @@
-package com.factory.web.service.remote;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.factory.base.entity.po.remote.Role;
-
-public interface RoleService extends IService<Role> {
-
-
-}

application-facade/src/main/java/com/factory/web/service/remote/UserInfoService.java

@@ -1,28 +0,0 @@
-package com.factory.web.service.remote;
-
-import com.factory.web.entity.vo.req.UserInsertReq;
-import com.factory.web.entity.vo.req.UserLockReq;
-import com.factory.web.entity.vo.req.UserPageQueryReq;
-import com.factory.web.entity.vo.res.UserRes;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.factory.base.entity.aggregates.PageBean;
-import com.factory.base.entity.aggregates.ResponseBean;
-import com.factory.base.entity.po.remote.UserInfo;
-
-import java.util.List;
-
-
-public interface UserInfoService extends IService<UserInfo> {
-
-    String getNameById(Long id);
-
-    List<UserInfo> getListByNameOrNo(String word);
-
-    ResponseBean<PageBean<UserRes>> selectUser(UserPageQueryReq userPageQueryReq);
-
-    ResponseBean<String> insertUser(UserInsertReq userInsertReq);
-
-    ResponseBean<String> updateUser(UserInsertReq userInsertReq);
-
-    ResponseBean<String> userLock(UserLockReq userLockReq);
-}

application-facade/src/main/java/com/factory/web/service/remote/UserRoleService.java

@@ -1,19 +0,0 @@
-package com.factory.web.service.remote;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.factory.base.entity.po.remote.UserRole;
-
-import java.util.List;
-
-public interface UserRoleService extends IService<UserRole> {
-
-    boolean userHasRole(Long userId, Long roleId);
-
-    List<UserRole> getRolesByUserId(Long userId);
-
-    List<Long> getRoleIdsByUserId(Long userId);
-
-
-
-
-}

application-facade/src/main/java/com/factory/web/service/remote/WorkStationService.java

@@ -1,10 +0,0 @@
-package com.factory.web.service.remote;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.factory.base.entity.po.remote.Workstation;
-
-public interface WorkStationService extends IService<Workstation> {
-
-    String geNameById(Long id);
-
-}

application-facade/src/main/java/com/factory/web/util/BeanCopyUtil.java

@@ -1,74 +0,0 @@
-package com.factory.web.util;
-
-import org.springframework.beans.BeanUtils;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Supplier;
-
-public class BeanCopyUtil extends BeanUtils {
-
-    /**
-     * 集合数据的拷贝
-     * @param sources: 数据源类
-     * @param target: 目标类::new(eg: UserVO::new)
-     * @return
-     */
-    public static <S, T> List<T> copyListProperties(List<S> sources, Supplier<T> target) {
-        List<T> list = new ArrayList<>(sources.size());
-        for (S source : sources) {
-            T t = target.get();
-            copyProperties(source, t);
-            list.add(t);
-        }
-        return list;
-    }
-
-    //将map复制成实体对象
-    public static <T> T map2Object(Map<String, Object> map, Class<T> clazz) {
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
-        if (map == null) {
-            return null;
-        }
-        T obj = null;
-        try {
-            // 使用newInstance来创建对象
-            obj = clazz.newInstance();
-            // 获取类中的所有字段
-            Field[] fields = obj.getClass().getDeclaredFields();
-            for (Field field : fields) {
-                int mod = field.getModifiers();
-                // 判断是拥有某个修饰符
-                if (Modifier.isStatic(mod) || Modifier.isFinal(mod)) {
-                    continue;
-                }
-                // 当字段使用private修饰时，需要加上
-                field.setAccessible(true);
-                // 获取参数类型名字
-                String filedTypeName = field.getType().getName();
-                // 判断是否为时间类型，使用equalsIgnoreCase比较字符串，不区分大小写
-                // 给obj的属性赋值
-                if (filedTypeName.equalsIgnoreCase("java.util.date")) {
-                    String datetimestamp = (String) map.get(field.getName());
-                    if (datetimestamp.equalsIgnoreCase("null")) {
-                        field.set(obj, null);
-                    } else {
-                        field.set(obj, sdf.parse(datetimestamp));
-                    }
-                } else {
-                    field.set(obj, map.get(field.getName()));
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return obj;
-    }
-
-}

application-facade/src/main/java/com/factory/web/util/CopyNullPreperty.java

@@ -1,49 +0,0 @@
-package com.factory.web.util;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.bean.copier.CopyOptions;
-import org.apache.commons.lang3.ArrayUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-
-/**
- * @program: intelligent-factory-service
- * @description:
- * @author: dl
- * @create: 05月12日 19时
- **/
-@Service
-public class CopyNullPreperty {
-
-    public  void copyNullProperty(Object source, Object target) {
-        Map<String, Object> stringObjectMap = BeanUtil.beanToMap(target, false, true);
-        String[] strings = stringObjectMap.keySet().toArray(new String[0]);
-
-        CopyOptions copyOptions = new CopyOptions();
-        copyOptions.setIgnoreNullValue(true);
-        copyOptions.setIgnoreProperties(strings);
-        //copyOptions.setIgnoreError(null);
-        CopyOptions copyOptions1 = CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true);
-        BeanUtil.copyProperties(source, target, copyOptions1);
-    }
-    public  void copyNullProperty(Object source, Object target,String...ignore) {
-        Map<String, Object> stringObjectMap = BeanUtil.beanToMap(target, false, true);
-        String[] strings = stringObjectMap.keySet().toArray(new String[0]);
-        String[] addAll = ArrayUtils.addAll(strings, ignore);
-        CopyOptions copyOptions = new CopyOptions();
-        copyOptions.setIgnoreNullValue(true);
-        copyOptions.setIgnoreProperties(addAll);
-        //copyOptions.setIgnoreError(null);
-        CopyOptions copyOptions1 = CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true);
-        BeanUtil.copyProperties(source, target, copyOptions1);
-    }
-
-    public  void copyigoneNull(Object source, Object target) {
-        CopyOptions copyOptions = new CopyOptions();
-        copyOptions.setIgnoreNullValue(true);
-        CopyOptions copyOptions1 = CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true);
-        BeanUtil.copyProperties(source, target, copyOptions1);
-    }
-
-}

application-facade/src/main/java/com/factory/web/util/CopyUtil.java

@@ -1,40 +0,0 @@
-package com.factory.web.util;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.bean.copier.CopyOptions;
-
-import java.util.Map;
-
-/**
- * @program: intelligent-factory-service
- * @description:
- * @author: dl
- * @create: 05月12日 17时
- **/
-public  class CopyUtil {
-    private static void copyNullProperty(Object source, Object target) {
-        Map<String, Object> stringObjectMap = BeanUtil.beanToMap(target, false, true);
-        String[] strings = stringObjectMap.keySet().stream().toArray(String[]::new);
-
-        CopyOptions copyOptions = new CopyOptions();
-        copyOptions.setIgnoreNullValue(true);
-        copyOptions.setIgnoreProperties(strings);
-
-        CopyOptions copyOptions1 = CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true);
-        BeanUtil.copyProperties(source, target, copyOptions1);
-    }
-    private static void copyNullProperty(Object source, Class clazz) throws IllegalAccessException, InstantiationException {
-        Object bean = clazz.newInstance();
-        Map<String, Object> stringObjectMap = BeanUtil.beanToMap(bean, false, true);
-        String[] strings = stringObjectMap.keySet().stream().toArray(String[]::new);
-
-        CopyOptions copyOptions = new CopyOptions();
-        copyOptions.setIgnoreNullValue(true);
-        copyOptions.setIgnoreProperties(strings);
-
-        CopyOptions copyOptions1 = CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true);
-        BeanUtil.copyProperties(source, bean, copyOptions1);
-    }
-
-
-}

application-facade/src/main/java/com/factory/web/util/PdfHandler.java

@@ -1,195 +0,0 @@
-package com.factory.web.util;
-
-
-import com.itextpdf.text.Document;
-import com.itextpdf.text.Image;
-import com.itextpdf.text.Rectangle;
-import com.itextpdf.text.pdf.*;
-import com.lowagie.text.DocumentException;
-import freemarker.template.Configuration;
-import freemarker.template.Template;
-import org.springframework.util.ResourceUtils;
-import org.xhtmlrenderer.pdf.ITextRenderer;
-
-import java.io.*;
-import java.nio.charset.StandardCharsets;
-import java.util.Map;
-import java.util.UUID;
-
-public class PdfHandler {
-
-    private static Configuration cfg = new Configuration(Configuration.VERSION_2_3_28);
-    /**
-     * 线上位置
-     */
-    private static final String SIM_SUN_TTC = "systemLib/font/simsun.ttc";
-    private static final String ARIAL_UNI = "systemLib/font/arialuni.ttf";
-    private static final String SIM_SUN = "systemLib/font/simsun.ttf";
-    private static final String FTL_LOCATION = "systemLib/template/";
-
-    private static final String PDF = ".pdf";
-    private static final String HTML = ".html";
-    private static final String FTL = ".ftl";
-
-    static {
-        cfg.setDefaultEncoding("UTF-8");
-        try {
-            File ftlDir = ResourceUtils.getFile(FTL_LOCATION);
-            cfg.setDirectoryForTemplateLoading(ftlDir);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * 生成pdf格式合同
-     */
-    public static File pdfContractHandler(
-            String templateName,
-            Map<String, Object> paramMap
-    ) {
-        String uuid = UUID.randomUUID().toString().replaceAll("-", "");
-        File pdfFilePath = null;
-        // 判断本地路径是否存在如果不存在则创建
-        try {
-            // 组装html和pdf合同的全路径URL
-            pdfFilePath = File.createTempFile(
-                    templateName + uuid, PDF
-            );
-            File htmlFilePath = File.createTempFile(
-                    templateName + uuid, HTML
-            );
-            templateName = templateName + FTL;
-            htmHandler(templateName, htmlFilePath, paramMap);
-            // 生成html合同
-            pdfHandler(htmlFilePath, pdfFilePath);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return pdfFilePath;
-    }
-
-
-    public static File createTempPdf(
-    ) {
-        String uuid = UUID.randomUUID().toString().replaceAll("-", "");
-        File pdfFilePath = null;
-        // 组装html和pdf合同的全路径URL
-        try {
-            pdfFilePath = File.createTempFile(
-                    uuid, PDF
-            );
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return pdfFilePath;
-    }
-
-
-    /**
-     * 生成html格式
-     */
-    private static void htmHandler(String templateName, File outHtmFile, Map<String, Object> paramMap) {
-        try {
-            Template template = cfg.getTemplate(templateName);
-            Writer out = new BufferedWriter(new OutputStreamWriter(
-                    new FileOutputStream(outHtmFile), StandardCharsets.UTF_8));
-            template.process(paramMap, out);
-            out.close();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-    }
-
-    /**
-     * 生成pdf格式
-     */
-    private static void pdfHandler(File htmFile, File pdfFile)
-            throws DocumentException, IOException {
-        String url = htmFile.toURI().toURL().toString();
-        OutputStream os = new FileOutputStream(pdfFile);
-        org.xhtmlrenderer.pdf.ITextRenderer renderer = new ITextRenderer();
-        renderer.setDocument(url);
-        org.xhtmlrenderer.pdf.ITextFontResolver fontResolver = renderer
-                .getFontResolver();
-        //加入字体支持
-        //打jar包后 无法直接读取jar包中的文件 放项目同目录即可
-        File simSunTtc = ResourceUtils.getFile(SIM_SUN_TTC);
-        File arialUni = ResourceUtils.getFile(ARIAL_UNI);
-        File simSun = ResourceUtils.getFile(SIM_SUN);
-        //设置字体
-        fontResolver.addFont(simSunTtc.getCanonicalPath(), BaseFont.IDENTITY_H, BaseFont.NOT_EMBEDDED);
-        fontResolver.addFont(arialUni.getCanonicalPath(), BaseFont.IDENTITY_H, BaseFont.NOT_EMBEDDED);
-        fontResolver.addFont(simSun.getCanonicalPath(), BaseFont.IDENTITY_H, BaseFont.NOT_EMBEDDED);
-        renderer.layout();
-        renderer.createPDF(os);
-        os.close();
-    }
-
-
-    public static void convert(String source, String target) {
-        Document document = new Document();
-        // 设置文档页边距
-        document.setMargins(0, 0, 0, 0);
-        FileOutputStream fos = null;
-        try {
-            fos = new FileOutputStream(target);
-            PdfWriter.getInstance(document, fos);
-            // 打开文档
-            document.open();
-            // 获取图片的宽高
-            Image image = Image.getInstance(source);
-            float imageHeight = image.getScaledHeight();
-            float imageWidth = image.getScaledWidth();
-            // 设置页面宽高与图片一致
-            Rectangle rectangle = new Rectangle(imageWidth, imageHeight);
-            document.setPageSize(rectangle);
-            // 图片居中
-            image.setAlignment(Image.ALIGN_CENTER);
-            // 新建一页添加图片
-            document.newPage();
-            document.add(image);
-        } catch (Exception ioe) {
-            System.out.println(ioe.getMessage());
-        } finally {
-            // 关闭文档
-            document.close();
-            try {
-                fos.flush();
-                fos.close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    public static boolean mergePdf(String[] files, String targetFile) {
-        boolean retValue = false;
-        Document document = null;
-        try {
-            document = new Document(new PdfReader(files[0]).getPageSize(1));
-            PdfCopy copy = new PdfCopy(document, new FileOutputStream(targetFile));
-            document.open();
-            for (int i = 0; i < files.length; i++) {
-                PdfReader reader = new PdfReader(files[i]);
-                int n = reader.getNumberOfPages();
-                for (int j = 1; j <= n; j++) {
-                    document.newPage();
-                    PdfImportedPage page = copy.getImportedPage(reader, j);
-                    copy.addPage(page);
-                }
-            }
-            retValue = true;
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            if (document!=null){
-                document.close();
-            }
-        }
-        return retValue;
-    }
-
-
-}

application-facade/src/main/java/com/factory/web/util/assembler/DeptAssembler.java

@@ -1,9 +0,0 @@
-package com.factory.web.util.assembler;
-
-import org.springframework.stereotype.Service;
-
-@Service
-public class DeptAssembler {
-
-
-}

application-facade/src/main/java/com/factory/web/util/assembler/IssueAssembler.java

@@ -1,44 +0,0 @@
-package com.factory.web.util.assembler;
-
-import com.factory.base.entity.constant.res.SystemConstant;
-import org.springframework.stereotype.Service;
-
-@Service
-public class IssueAssembler {
-
-    // 停机问题状态(1待处理2处理中3已完成/关闭)
-    public String statusToStatusValue(Integer status) {
-        if (status == null) {
-            return SystemConstant.EMPTY_STRING;
-        }
-        switch (status) {
-            case 0:
-                return "打开";
-            case 1:
-                return "关闭";
-            default:
-                return SystemConstant.EMPTY_STRING;
-        }
-    }
-    // 停机问题状态(1待处理2处理中3已完成/关闭)
-    public String solutionStatusToStatusValue(Integer status) {
-        if (status == null) {
-            return SystemConstant.EMPTY_STRING;
-        }
-        switch (status) {
-            case 0:
-                return "等待指派";
-            case 1:
-                return "待完成";
-            case 2:
-                return "处理中";
-            case 3:
-                return "已完成";
-            default:
-                return SystemConstant.EMPTY_STRING;
-        }
-    }
-
-
-
-}

application-facade/src/main/java/com/factory/web/util/assembler/UserAssembler.java

@@ -1,16 +0,0 @@
-package com.factory.web.util.assembler;
-
-import com.factory.web.service.remote.UserInfoService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-@Service
-public class UserAssembler {
-
-    @Resource
-    private UserInfoService userInfoService;
-
-
-
-}

application-facade/src/main/java/com/factory/web/util/assembler/WebFileInfoAssembler.java

@@ -1,29 +0,0 @@
-package com.factory.web.util.assembler;
-
-import com.factory.base.entity.constant.res.SystemConstant;
-import com.factory.base.entity.po.file.FileInfo;
-import com.factory.config.properties.FileSystemProperties;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-@Service
-public class WebFileInfoAssembler {
-
-    @Resource
-    private FileSystemProperties fileSystemProperties;
-
-    public String getUrlByFileInfo(FileInfo fileInfo) {
-        if (fileInfo == null) {
-            return SystemConstant.EMPTY_STRING;
-        }
-        if (StringUtils.isBlank(fileInfo.getUri())) {
-            return SystemConstant.EMPTY_STRING;
-        }
-        return StringUtils.join(
-                fileSystemProperties.getDownloadPrefix(),
-                fileInfo.getUri()
-        );
-    }
-}

application-facade/src/main/java/com/factory/web/util/assembler/WorkStationAssembler.java

@@ -1,16 +0,0 @@
-package com.factory.web.util.assembler;
-
-import com.factory.web.service.remote.WorkStationService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-@Service
-public class WorkStationAssembler {
-
-    @Resource
-    private WorkStationService workStationService;
-
-
-
-}

application-facade/src/main/java/com/factory/web/util/event/JsonSerializerManage.java

@@ -1,33 +0,0 @@
-package com.factory.web.util.event;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.jackson.JsonComponent;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Primary;
-import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
-
-/**
- * long类型存储返回json太长丢失精度问题
- */
-@JsonComponent
-public class JsonSerializerManage {
-
-    @Bean
-    @Primary
-    @ConditionalOnMissingBean(ObjectMapper.class)
-    public ObjectMapper jacksonObjectMapper(Jackson2ObjectMapperBuilder builder) {
-        ObjectMapper objectMapper = builder.createXmlMapper(false).build();
-        objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-        SimpleModule module = new SimpleModule();
-        module.addSerializer(Long.class, ToStringSerializer.instance);
-        module.addSerializer(Long.TYPE, ToStringSerializer.instance);
-        objectMapper.registerModule(module);
-        return objectMapper;
-    }
-
-}
-

application-file/src/main/java/com/factory/file/config/UpdateFileStoreDirListener.java

@@ -2,7 +2,7 @@ package com.factory.file.config;
 
 
 import com.factory.config.properties.FileSystemProperties;
-import com.factory.base.entity.constant.res.SystemConstant;
+import com.factory.base.entity.constant.SystemConstant;
 import com.factory.base.util.file.FileUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;

application-file/src/main/java/com/factory/file/config/WebMvcConfig.java

@@ -2,7 +2,7 @@ package com.factory.file.config;
 
 
 import com.factory.config.properties.FileSystemProperties;
-import com.factory.base.entity.constant.res.SystemConstant;
+import com.factory.base.entity.constant.SystemConstant;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.context.annotation.Configuration;

application-file/src/main/java/com/factory/file/controller/FileController.java

@@ -1,10 +1,10 @@
 package com.factory.file.controller;
 
 
+import com.factory.base.entity.auth.FileType;
 import com.factory.base.entity.aggregates.ResponseBean;
 import com.factory.file.service.FileInfoService;
 import com.factory.file.entity.vo.FileRes;
-import com.factory.base.config.file.FileType;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;

application-file/src/main/java/com/factory/file/service/FileInfoService.java

@@ -2,9 +2,9 @@ package com.factory.file.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.factory.base.entity.auth.FileType;
 import com.factory.base.entity.aggregates.ResponseBean;
 import com.factory.file.entity.vo.FileRes;
-import com.factory.base.config.file.FileType;
 import com.factory.base.entity.po.file.FileInfo;
 import org.springframework.web.multipart.MultipartFile;