cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
@@ -126,5 +126,6 @@ public Result selectDeviceByCategory(String category) { return Result.success(deviceService.selectDeviceByCategory(category)); } } cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java
@@ -1,28 +1,30 @@ package com.yuanchu.mom.controller; import cn.hutool.core.lang.UUID; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yuanchu.mom.annotation.ValueAuth; import com.yuanchu.mom.annotation.ValueTableShow; import com.yuanchu.mom.pojo.Laboratory; import com.yuanchu.mom.service.LaboratoryService; import com.yuanchu.mom.utils.JackSonUtil; import com.yuanchu.mom.vo.Result; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; import java.util.Map; /** * å®éªå®¤ç®¡ç(LaboratoryController)表æ§å¶å± */ @Api(tags = "åºææè®¾æ½") @AllArgsConstructor @RestController @RequestMapping("/laboratoryScope") public class LaboratoryController { @Value("${file.path}") private String filePath; private LaboratoryService laboratoryService; @@ -60,3 +62,9 @@ } } cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,52 @@ package com.yuanchu.mom.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yuanchu.mom.pojo.Seal; import com.yuanchu.mom.service.SealService; import com.yuanchu.mom.utils.JackSonUtil; import com.yuanchu.mom.vo.Result; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.Map; /** * å°ç« 管ç(SealController)表æ§å¶å± */ @Api(tags = "å°ç« 管ç") @RestController @RequestMapping("/sealScope") public class SealController { @Resource private SealService sealService; @ApiOperation(value = "å é¤å°ç« ") @PostMapping("/deleteSeal") public Result deleteSeal(@RequestBody Integer id) { return Result.success(sealService.delSeal(id)); } @ApiOperation(value = "æ·»å å°ç« åæ°") @PostMapping("/addSeal") public Result addSeal(@RequestBody Seal seal) { return Result.success(sealService.addSeal(seal)); } @ApiOperation(value = "ä¿®æ¹å°ç« åæ°") @PostMapping("/upSeal") public Result upSeal(@RequestBody Seal seal){ return Result.success(sealService.upSeal(seal)); } @ApiOperation(value="æ¥è¯¢å°ç« å表") @PostMapping("/selectSeal") public Result selectSeal(@RequestBody Map<String, Object> data) throws Exception { //è·åå½åé¡µæ° Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class); //è·åå½åå°ç« ä¿¡æ¯ Seal seal = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Seal.class); //è·ååé¡µæ°æ® return Result.success(sealService.selectSeal(page,seal)); } } cnas-server/src/main/java/com/yuanchu/mom/mapper/DepartmentMapper.java
@@ -29,6 +29,7 @@ //æ ¹æ®éæ©çæ å±ç¤ºç¸å ³ç人å IPage<UserDto> showUserById(@Param("page") IPage<UserDto> page, @Param("ids") List<String> ids, @Param("ew") QueryWrapper<UserDto> ew); //æ ¹æ®é¨é¨id,æ¥è¯¢ä»çææåç±»id List<Integer> selectSonById(Integer id); } cnas-server/src/main/java/com/yuanchu/mom/mapper/LaboratoryMapper.java
@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yuanchu.mom.pojo.Laboratory; import java.util.Map; /** * å®éªå®¤ç®¡ç(Laboratory)è¡¨æ°æ®åºè®¿é®å± */ @@ -14,5 +16,6 @@ IPage<Laboratory> selectItemParameter(Page page, QueryWrapper<Laboratory> ew); Object obtainItemParameterList(Page page, QueryWrapper<Laboratory> queryWrappers); } cnas-server/src/main/java/com/yuanchu/mom/mapper/SealMapper.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,13 @@ package com.yuanchu.mom.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yuanchu.mom.pojo.Certification; import com.yuanchu.mom.pojo.Seal; public interface SealMapper extends BaseMapper<Seal> { IPage<Seal> selectSeal(Page page, QueryWrapper<Seal> ew); } cnas-server/src/main/java/com/yuanchu/mom/pojo/Laboratory.java
@@ -6,6 +6,7 @@ import com.yuanchu.mom.common.OrderBy; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; import java.time.LocalDateTime; @@ -15,6 +16,7 @@ */ @TableName(value = "laboratory") @Data @NoArgsConstructor public class Laboratory extends OrderBy implements Serializable { @ApiModelProperty(value = "主é®") @TableId(type = IdType.AUTO) cnas-server/src/main/java/com/yuanchu/mom/pojo/Seal.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,42 @@ package com.yuanchu.mom.pojo; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import com.yuanchu.mom.annotation.ValueTableShow; import com.yuanchu.mom.common.OrderBy; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; import java.time.LocalDateTime; /** * å°ç« 管ç(Laboratory)表对象 */ @TableName(value = "seal") @Data public class Seal extends OrderBy implements Serializable { @ApiModelProperty(value = "主é®") @TableId(type = IdType.AUTO) private Integer id; @ValueTableShow(2) @ApiModelProperty(value = "å°ç« å°å") private String address; @ValueTableShow(3) @ApiModelProperty(value = "å°ç« ç±»å") private String type; @ApiModelProperty(value = "å建人id") @TableField(fill = FieldFill.INSERT) private Integer createUser; @ValueTableShow(5) @ApiModelProperty(value = "å建æ¶é´") @TableField(fill = FieldFill.INSERT) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; } cnas-server/src/main/java/com/yuanchu/mom/service/LaboratoryService.java
@@ -22,5 +22,6 @@ List<Laboratory> obtainItemParameterList(); } cnas-server/src/main/java/com/yuanchu/mom/service/SealService.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,23 @@ package com.yuanchu.mom.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.yuanchu.mom.pojo.Laboratory; import com.yuanchu.mom.pojo.Seal; import java.util.Map; public interface SealService extends IService<Seal> { //æ°å¢ int addSeal(Seal seal); //å é¤ int delSeal(int id); //æ´æ° int upSeal(Seal seal); //æ¥è¯¢ Map<String, Object> selectSeal(Page page, Seal seal); } cnas-server/src/main/java/com/yuanchu/mom/service/impl/LaboratoryServiceImpl.java
@@ -56,5 +56,7 @@ public List<Laboratory> obtainItemParameterList() { return laboratoryMapper.selectList(Wrappers.<Laboratory>lambdaQuery().select(Laboratory::getLaboratoryName)); } } cnas-server/src/main/java/com/yuanchu/mom/service/impl/SealServiceImpl.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,50 @@ package com.yuanchu.mom.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.yuanchu.mom.common.GetLook; import com.yuanchu.mom.common.PrintChina; import com.yuanchu.mom.mapper.LaboratoryMapper; import com.yuanchu.mom.mapper.SealMapper; import com.yuanchu.mom.pojo.Certification; import com.yuanchu.mom.pojo.Laboratory; import com.yuanchu.mom.pojo.Seal; import com.yuanchu.mom.service.SealService; import com.yuanchu.mom.utils.QueryWrappers; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import java.util.HashMap; import java.util.Map; @Service @AllArgsConstructor public class SealServiceImpl extends ServiceImpl<SealMapper, Seal> implements SealService { private SealMapper sealMapper; @Override public int addSeal(Seal seal) { return sealMapper.insert(seal); } @Override public int delSeal(int id) { return sealMapper.deleteById(id); } @Override public int upSeal(Seal seal) { return sealMapper.updateById(seal); } @Override public Map<String, Object> selectSeal(Page page, Seal seal) { Map<String, Object> map = new HashMap<>(); map.put("head", PrintChina.printChina(Seal.class)); map.put("body", sealMapper.selectSeal(page, QueryWrappers.queryWrappers(seal))); System.out.println(page); return map; } } cnas-server/src/main/resources/mapper/DeviceMapper.xml
@@ -80,7 +80,6 @@ </select> <update id="upDeviceParameter" parameterType="com.yuanchu.mom.pojo.Device"> UPDATE device <set> <if test="largeCategory!=null and largeCategory!='' ">large_category=#{largeCategory},</if> cnas-server/src/main/resources/mapper/LaboratoryMapper.xml
@@ -4,7 +4,6 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.yuanchu.mom.mapper.LaboratoryMapper"> <select id="selectItemParameter" resultType="com.yuanchu.mom.pojo.Laboratory"> select * from ( cnas-server/src/main/resources/mapper/SealMapper.xml
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.yuanchu.mom.mapper.SealMapper"> <select id="selectSeal" resultType="com.yuanchu.mom.mapper.SealMapper"> select s.address,s.type,u.`name`,s.create_time from seal s LEFT JOIN `user` u on s.create_user=u.id <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''"> ${ew.customSqlSegment} </if> </select> </mapper> system-run/src/main/resources/application-prod.yml
@@ -55,7 +55,6 @@ useGlobalDataSourceStat: true #åå¹¶å¤ä¸ªDruidDatasourceççæ§æ°æ® connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=500; #éè¿connectProperties屿§æ¥æå¼mergesqlåè½ç½æ ¢sQLè®°å½ redis: # redisæ°æ®åºç´¢å¼(é»è®¤ä¸º0)ï¼æä»¬ä½¿ç¨ç´¢å¼ä¸º3çæ°æ®åºï¼é¿å åå ¶ä»æ°æ®åºå²çª database: 0 system-run/src/main/resources/application.yml
@@ -1,5 +1,5 @@ server: port: 8001 port: 8002 spring: profiles: active: dev