学生健康模块

src/main/java/com/xjrsoft/module/personnel/controller/FaceManagementController.java

@@ -6,12 +6,10 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.yulichang.toolkit.MPJWrappers;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.enums.DeleteMark;
-import com.xjrsoft.common.exception.MyException;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
@@ -32,8 +30,6 @@ import com.xjrsoft.module.system.service.ICodeRuleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.apache.commons.lang3.StringUtils;
-import org.jetbrains.annotations.NotNull;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -45,12 +41,8 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 @RestController
 @RequestMapping("/personnel" + "/facemanager")

src/main/java/com/xjrsoft/module/personnel/controller/PersonnelHealthyController.java

@@ -0,0 +1,106 @@
+package com.xjrsoft.module.personnel.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.personnel.dto.AddPersonnelHealthyDto;
+import com.xjrsoft.module.personnel.dto.PersonnelHealthyPageDto;
+import com.xjrsoft.module.personnel.dto.UpdatePersonnelHealthyDto;
+import com.xjrsoft.module.personnel.entity.PersonnelHealthy;
+import com.xjrsoft.module.personnel.service.IPersonnelHealthyService;
+import com.xjrsoft.module.personnel.vo.PersonnelHealthyPageVo;
+import com.xjrsoft.module.personnel.vo.PersonnelHealthyVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+* @title: 人员健康信息表
+* @Author dzx
+* @Date: 2024-07-23
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/personnel" + "/personnelHealthy")
+@Api(value = "/personnel"  + "/personnelHealthy",tags = "人员健康信息表代码")
+@AllArgsConstructor
+public class PersonnelHealthyController {
+
+
+    private final IPersonnelHealthyService personnelHealthyService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="人员健康信息表列表(分页)")
+    @SaCheckPermission("personnelhealthy:detail")
+    public RT<PageOutput<PersonnelHealthyPageVo>> page(@Valid PersonnelHealthyPageDto dto){
+
+
+        LambdaQueryWrapper<PersonnelHealthy> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                    .orderByDesc(PersonnelHealthy::getId)
+                .eq(StrUtil.isNotEmpty(dto.getType()), PersonnelHealthy::getType, dto.getType())
+                .eq(PersonnelHealthy::getUserId, StpUtil.getLoginIdAsLong())
+                .select(PersonnelHealthy.class,x -> VoToColumnUtil.fieldsToColumns(PersonnelHealthyPageVo.class).contains(x.getProperty()));
+        IPage<PersonnelHealthy> page = personnelHealthyService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<PersonnelHealthyPageVo> pageOutput = ConventPage.getPageOutput(page, PersonnelHealthyPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询人员健康信息表信息")
+    @SaCheckPermission("personnelhealthy:detail")
+    public RT<PersonnelHealthyVo> info(@RequestParam Long id){
+        PersonnelHealthy personnelHealthy = personnelHealthyService.getById(id);
+        if (personnelHealthy == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(personnelHealthy, PersonnelHealthyVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增人员健康信息表")
+    @SaCheckPermission("personnelhealthy:add")
+    public RT<Boolean> add(@Valid @RequestBody AddPersonnelHealthyDto dto){
+        PersonnelHealthy personnelHealthy = BeanUtil.toBean(dto, PersonnelHealthy.class);
+        boolean isSuccess = personnelHealthyService.save(personnelHealthy);
+        return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改人员健康信息表")
+    @SaCheckPermission("personnelhealthy:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdatePersonnelHealthyDto dto){
+
+        PersonnelHealthy personnelHealthy = BeanUtil.toBean(dto, PersonnelHealthy.class);
+        return RT.ok(personnelHealthyService.updateById(personnelHealthy));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除人员健康信息表")
+    @SaCheckPermission("personnelhealthy:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(personnelHealthyService.removeBatchByIds(ids));
+
+    }
+
+}

src/main/java/com/xjrsoft/module/personnel/controller/TeacherFaceProcessController.java

@@ -45,7 +45,14 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
@@ -54,7 +61,12 @@ import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.Base64;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 

src/main/java/com/xjrsoft/module/personnel/dto/AddPersonnelHealthyDto.java

@@ -0,0 +1,42 @@
+package com.xjrsoft.module.personnel.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+
+/**
+* @title: 人员健康信息表
+* @Author dzx
+* @Date: 2024-07-23
+* @Version 1.0
+*/
+@Data
+public class AddPersonnelHealthyDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 疾病名称
+    */
+    @ApiModelProperty("疾病名称")
+    private Long userId;
+    /**
+    * 疾病名称
+    */
+    @ApiModelProperty("疾病名称")
+    private String name;
+    /**
+    * 疾病类别(xjr_dictionary_item[healthy_type])
+    */
+    @ApiModelProperty("疾病类别(xjr_dictionary_item[healthy_type])")
+    private String type;
+    /**
+    * 病史来源
+    */
+    @ApiModelProperty("病史来源")
+    private String source;
+
+}

src/main/java/com/xjrsoft/module/personnel/dto/PersonnelHealthyPageDto.java

@@ -0,0 +1,22 @@
+package com.xjrsoft.module.personnel.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+* @title: 人员健康信息表分页查询入参
+* @Author dzx
+* @Date: 2024-07-23
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class PersonnelHealthyPageDto extends PageInput {
+
+    @ApiModelProperty("疾病类别(xjr_dictionary_item[healthy_type])")
+    private String type;
+
+}

src/main/java/com/xjrsoft/module/personnel/dto/UpdatePersonnelHealthyDto.java

@@ -0,0 +1,24 @@
+package com.xjrsoft.module.personnel.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+
+/**
+* @title: 人员健康信息表
+* @Author dzx
+* @Date: 2024-07-23
+* @Version 1.0
+*/
+@Data
+public class UpdatePersonnelHealthyDto extends AddPersonnelHealthyDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long id;
+}

src/main/java/com/xjrsoft/module/personnel/entity/PersonnelHealthy.java

@@ -0,0 +1,94 @@
+package com.xjrsoft.module.personnel.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+* @title: 人员健康信息表
+* @Author dzx
+* @Date: 2024-07-23
+* @Version 1.0
+*/
+@Data
+@TableName("personnel_healthy")
+@ApiModel(value = "personnel_healthy", description = "人员健康信息表")
+public class PersonnelHealthy implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @TableId
+    private Long id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 修改日期
+    */
+    @ApiModelProperty("修改日期")
+    @TableField(fill = FieldFill.UPDATE)
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 有效标记
+    */
+    @ApiModelProperty("有效标记")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 疾病名称
+    */
+    @ApiModelProperty("疾病名称")
+    private Long userId;
+    /**
+    * 疾病名称
+    */
+    @ApiModelProperty("疾病名称")
+    private String name;
+    /**
+    * 疾病类别(xjr_dictionary_item[healthy_type])
+    */
+    @ApiModelProperty("疾病类别(xjr_dictionary_item[healthy_type])")
+    private String type;
+    /**
+    * 病史来源
+    */
+    @ApiModelProperty("病史来源")
+    private String source;
+
+
+}

src/main/java/com/xjrsoft/module/personnel/mapper/PersonnelHealthyMapper.java

@@ -0,0 +1,16 @@
+package com.xjrsoft.module.personnel.mapper;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.personnel.entity.PersonnelHealthy;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 人员健康信息表
+* @Author dzx
+* @Date: 2024-07-23
+* @Version 1.0
+*/
+@Mapper
+public interface PersonnelHealthyMapper extends MPJBaseMapper<PersonnelHealthy> {
+
+}

src/main/java/com/xjrsoft/module/personnel/service/IPersonnelHealthyService.java

@@ -0,0 +1,14 @@
+package com.xjrsoft.module.personnel.service;
+
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.personnel.entity.PersonnelHealthy;
+
+/**
+* @title: 人员健康信息表
+* @Author dzx
+* @Date: 2024-07-23
+* @Version 1.0
+*/
+
+public interface IPersonnelHealthyService extends MPJBaseService<PersonnelHealthy> {
+}

src/main/java/com/xjrsoft/module/personnel/service/impl/PersonnelHealthyServiceImpl.java

@@ -0,0 +1,19 @@
+package com.xjrsoft.module.personnel.service.impl;
+
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.personnel.entity.PersonnelHealthy;
+import com.xjrsoft.module.personnel.mapper.PersonnelHealthyMapper;
+import com.xjrsoft.module.personnel.service.IPersonnelHealthyService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+/**
+* @title: 人员健康信息表
+* @Author dzx
+* @Date: 2024-07-23
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class PersonnelHealthyServiceImpl extends MPJBaseServiceImpl<PersonnelHealthyMapper, PersonnelHealthy> implements IPersonnelHealthyService {
+}

src/main/java/com/xjrsoft/module/personnel/vo/PersonnelHealthyPageVo.java

@@ -0,0 +1,73 @@
+package com.xjrsoft.module.personnel.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+* @title: 人员健康信息表分页列表出参
+* @Author dzx
+* @Date: 2024-07-23
+* @Version 1.0
+*/
+@Data
+public class PersonnelHealthyPageVo {
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    private Long modifyUserId;
+    /**
+    * 修改日期
+    */
+    @ApiModelProperty("修改日期")
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    private Integer deleteMark;
+    /**
+    * 有效标记
+    */
+    @ApiModelProperty("有效标记")
+    private Integer enabledMark;
+    /**
+    * 疾病名称
+    */
+    @ApiModelProperty("疾病名称")
+    private Long userId;
+    /**
+    * 疾病名称
+    */
+    @ApiModelProperty("疾病名称")
+    private String name;
+    /**
+    * 疾病类别(xjr_dictionary_item[healthy_type])
+    */
+    @ApiModelProperty("疾病类别(xjr_dictionary_item[healthy_type])")
+    private String type;
+    /**
+    * 病史来源
+    */
+    @ApiModelProperty("病史来源")
+    private String source;
+
+}

src/main/java/com/xjrsoft/module/personnel/vo/PersonnelHealthyVo.java

@@ -0,0 +1,43 @@
+package com.xjrsoft.module.personnel.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+* @title: 人员健康信息表表单出参
+* @Author dzx
+* @Date: 2024-07-23
+* @Version 1.0
+*/
+@Data
+public class PersonnelHealthyVo {
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long id;
+    /**
+    * 疾病名称
+    */
+    @ApiModelProperty("疾病名称")
+    private Long userId;
+    /**
+    * 疾病名称
+    */
+    @ApiModelProperty("疾病名称")
+    private String name;
+    /**
+    * 疾病类别(xjr_dictionary_item[healthy_type])
+    */
+    @ApiModelProperty("疾病类别(xjr_dictionary_item[healthy_type])")
+    private String type;
+    /**
+    * 病史来源
+    */
+    @ApiModelProperty("病史来源")
+    private String source;
+
+
+
+}

src/test/java/com/xjrsoft/xjrsoftboot/FreeMarkerGeneratorTest.java

@@ -3498,4 +3498,31 @@ public class FreeMarkerGeneratorTest {
 
         apiGeneratorService.generateCodes(params);
     }
+
+
+    @Test
+    public void gcPersonnelHealthy() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("personnel_healthy");//init_sql中的表名
+        mainTable.setIsMain(true);//是否是主表，一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        tableConfigs.add(mainTable);
+
+
+        ApiGenerateCodesDto params = new ApiGenerateCodesDto();
+        params.setAuthor("dzx");//作者名称
+        params.setPackageName("personnel");//包名
+        params.setTableConfigs(tableConfigs);
+        params.setPage(true);//是否生成分页接口
+        params.setImport(false);//是否生成导入接口
+        params.setExport(false);//是否生成导出接口
+        params.setOutMainDir(true);//是否生成在主目录，前期测试可设置成false
+        params.setDs(ds);
+
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+    }
 }