cnas-server/src/main/java/com/yuanchu/mom/controller/CertificationController.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,53 @@ package com.yuanchu.mom.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yuanchu.mom.pojo.Certification; import com.yuanchu.mom.pojo.Device; import com.yuanchu.mom.service.CertificationService; import com.yuanchu.mom.utils.JackSonUtil; import com.yuanchu.mom.vo.Result; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; import java.util.Map; @Api(tags = "èµè´¨è¯´æ") @AllArgsConstructor @RestController @RequestMapping("/certification") public class CertificationController { private CertificationService certificationService; @ApiOperation(value = "æ¥è¯¢èµè´¨æç»å表") @PostMapping("/getCertificationDetail") public Result getCertificationDetail(@RequestBody Map<String, Object> data) throws Exception { Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class); Certification certification = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Certification.class); return Result.success(certificationService.getCertificationDetail(page, certification)); } @ApiOperation(value = "æ·»å èµè´¨æç»å表") @PostMapping("/addCertificationDetail") public Result addCertificationDetail(@RequestBody Certification certification) { return Result.success(certificationService.addCertificationDetail(certification)); } @ApiOperation(value = "å é¤èµè´¨æç»å表") @PostMapping("/delCertificationDetail") public Result<?> delCertificationDetail(List<Integer> ids) { return Result.success(certificationService.delCertificationDetail(ids)); } @ApiOperation(value = "éä»¶ä¸è½½") @PostMapping("/downFile") public Result<?> downFile(Integer id) { return Result.success(certificationService.downFile(id)); } } cnas-server/src/main/java/com/yuanchu/mom/mapper/CertificationMapper.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; public interface CertificationMapper extends BaseMapper<Certification> { //æ¥è¯¢èµè´¨æç»å表 IPage<Certification> getCertificationDetail(Page page, QueryWrapper<Certification> ew); } cnas-server/src/main/java/com/yuanchu/mom/pojo/Certification.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,81 @@ 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; @TableName(value = "certification") @Data public class Certification extends OrderBy implements Serializable { @ApiModelProperty(value = "主é®") @TableId(type = IdType.AUTO) private Integer id; @ValueTableShow(2) @ApiModelProperty(value = "èµè´¨åç§°") private String name; @ValueTableShow(3) @ApiModelProperty(value = "èµè´¨ç¼ç ") private String code; @ValueTableShow(4) @ApiModelProperty(value = "é¢åæºæ") private String organization; @ValueTableShow(5) @ApiModelProperty(value = "èµè´¨è¯´æ") private String explain; @ValueTableShow(6) @ApiModelProperty(value = "馿¬¡é¢åæ¶é´") private LocalDateTime firstTime; @ValueTableShow(7) @ApiModelProperty(value = "æè¿é¢åæ¶é´") private LocalDateTime recentlyTime; @ValueTableShow(8) @ApiModelProperty(value = "å°æé¢åæ¶é´") private LocalDateTime expireTime; @ApiModelProperty(value = "å建人") @TableField(fill = FieldFill.INSERT) private Integer createUser; @ValueTableShow(9) @ApiModelProperty(value = "å建人") private String createUserName; @ApiModelProperty(value = "ä¿®æ¹äººid") @TableField(fill = FieldFill.INSERT_UPDATE) private Integer updateUser; @ValueTableShow(10) @ApiModelProperty(value = "å建æ¶é´") @TableField(fill = FieldFill.INSERT) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; @ApiModelProperty(value = "æ´æ°æ¶é´") @TableField(fill = FieldFill.INSERT_UPDATE) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; @ValueTableShow(11) @ApiModelProperty(value = "ç¶æ") private Integer state; @ApiModelProperty(value = "èµè´¨å¾çå°å") private String imageUrl; @ApiModelProperty(value = "èµè´¨éä»¶å°å") private String fileUrl; } cnas-server/src/main/java/com/yuanchu/mom/service/CertificationService.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,22 @@ 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.Certification; import java.util.List; import java.util.Map; public interface CertificationService extends IService<Certification> { //æ¥è¯¢èµè´¨æç»å表 Map<String,Object> getCertificationDetail(Page page, Certification certification); //æ·»å èµè´¨æç»å表 int addCertificationDetail(Certification certification); //å é¤èµè´¨æç»å表 int delCertificationDetail(List<Integer> ids); //éä»¶ä¸è½½ String downFile(Integer id); } cnas-server/src/main/java/com/yuanchu/mom/service/impl/CertificationServiceImpl.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,56 @@ 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.CertificationMapper; import com.yuanchu.mom.pojo.Certification; import com.yuanchu.mom.pojo.Device; import com.yuanchu.mom.service.CertificationService; import com.yuanchu.mom.utils.QueryWrappers; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.HashMap; import java.util.List; import java.util.Map; @Service @AllArgsConstructor @Transactional(rollbackFor = Exception.class) public class CertificationServiceImpl extends ServiceImpl<CertificationMapper, Certification> implements CertificationService { private CertificationMapper certificationMapper; private GetLook getLook; //æ¥è¯¢èµè´¨æç»å表 @Override public Map<String, Object> getCertificationDetail(Page page, Certification certification) { Map<String, Object> map = new HashMap<>(); map.put("head", PrintChina.printChina(Certification.class)); Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("getCertificationDetail"); if (map1.get("look") == 1) certification.setCreateUser(map1.get("userId")); map.put("body", certificationMapper.getCertificationDetail(page, QueryWrappers.queryWrappers(certification))); return map; } //æ·»å èµè´¨æç»å表 @Override public int addCertificationDetail(Certification certification) { return certificationMapper.insert(certification); } //å é¤èµè´¨æç»å表 @Override public int delCertificationDetail(List<Integer> ids) { return certificationMapper.deleteBatchIds(ids); } //éä»¶ä¸è½½ @Override public String downFile(Integer id) { return certificationMapper.selectById(id).getFileUrl(); } } cnas-server/src/main/resources/mapper/CertificationMapper.xml
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,27 @@ <?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.CertificationMapper"> <select id="getCertificationDetail" resultType="com.yuanchu.mom.pojo.Certification"> select * from (select c.id, c.name, c.code, organization, `explain`, first_time, recently_time, expire_time, u1.name create_user_name, c.create_time, now()>expire_time?0:1 as state, image_url, file_url from certification c left join user u1 on c.create_user = u1.id order by c.id desc) a group by a.name <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''"> ${ew.customSqlSegment} </if> </select> </mapper> inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java
@@ -11,6 +11,8 @@ import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Map; @RestController @@ -32,4 +34,22 @@ public Result testProductByDay(){ return Result.success(reportService.testProductByDay()); } @ApiOperation(value = "é¦é¡µ-->æ¥åä»»å¡å¾") @GetMapping("/calendarWorkByWeek") public Result calendarWorkByWeek(){ return Result.success(reportService.calendarWorkByWeek()); } @ApiOperation(value = "é¦é¡µ-->æ·»å æ¥ç¨") @PostMapping("/addSchedule") public Result addSchedule(String time, String text){ return Result.success(reportService.addSchedule(time,text)); } @ApiOperation(value = "é¦é¡µ-->æçæ¥ç¨") @PostMapping("/ScheduleByMe") public Result ScheduleByMe(String date){ return Result.success(reportService.ScheduleByMe(date)); } } inspect-server/src/main/java/com/yuanchu/mom/service/ReportService.java
@@ -1,6 +1,11 @@ package com.yuanchu.mom.service; import com.yuanchu.mom.pojo.Schedule; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.List; import java.util.Map; public interface ReportService { @@ -10,4 +15,13 @@ //æ£æµé¡¹ç®ç»è®¡ Map<String,Object> testProductByDay(); //é¦é¡µ-->æ¥åä»»å¡å¾ Map<String,Object> calendarWorkByWeek(); //é¦é¡µ-->æ·»å æ¥ç¨ int addSchedule(String time, String text); //é¦é¡µ-->æçæ¥ç¨ List<Schedule> ScheduleByMe(String date); } inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java
@@ -4,13 +4,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yuanchu.mom.common.GetLook; import com.yuanchu.mom.dto.CostStatisticsDto; import com.yuanchu.mom.mapper.InsOrderMapper; import com.yuanchu.mom.mapper.InsProductMapper; import com.yuanchu.mom.mapper.InsProductUserMapper; import com.yuanchu.mom.pojo.InsOrder; import com.yuanchu.mom.pojo.InsProduct; import com.yuanchu.mom.pojo.InsProductUser; import com.yuanchu.mom.mapper.*; import com.yuanchu.mom.pojo.*; import com.yuanchu.mom.service.ReportService; import com.yuanchu.mom.utils.QueryWrappers; import lombok.AllArgsConstructor; @@ -20,10 +17,12 @@ import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @Service @AllArgsConstructor @@ -32,6 +31,9 @@ private InsOrderMapper insOrderMapper; private InsProductUserMapper insProductUserMapper; private InsProductMapper insProductMapper; private GetLook getLook; private ScheduleMapper scheduleMapper; private UserMapper userMapper; //æ¯æ¥ä¸å¡ç»è®¡ @Override @@ -157,4 +159,55 @@ /*è¿åæ¥çé¡¹ç®æ¥æ¶éä¸å®æé*/ return map; } //é¦é¡µ-->æ¥åä»»å¡å¾ @Override public Map<String, Object> calendarWorkByWeek() { Map<String, Object> map = new HashMap<>(); List<Integer> insState=new ArrayList<>(); insState.add(0); insState.add(1); /*è·ååä¸å¨æ¥æ*/ LocalDate currentDate = LocalDate.now(); List<LocalDate> weekDays = new ArrayList<>(); for (int i = 0; i <7; i++) { weekDays.add(currentDate.plusDays(i)); //æ¥è¯¢å½å¤©éè¦æ£æµçå§æè®¢å List<InsOrder> insOrders = insOrderMapper.selectList(Wrappers.<InsOrder>lambdaQuery().eq(InsOrder::getState, 1).in(InsOrder::getInsState, insState).apply("DATE(create_time) = CURDATE() - INTERVAL " + i + " DAY")); List<Map<String,Object>> works = insOrders.stream().map(insOrder -> { HashMap<String, Object> hashMap = new HashMap<>(); hashMap.put("text","å§æè®¢å" + insOrder.getEntrustCode() + "æ£æµ"); hashMap.put("type",insOrder.getType()); User user = userMapper.selectById(insOrder.getCreateUser()); hashMap.put("name", user.getName()); return hashMap; }).collect(Collectors.toList()); map.put("work"+i, works); } map.put("weekDays", weekDays); return map; } //é¦é¡µ-->æ·»å æ¥ç¨ @Override public int addSchedule(String time, String text) { //è·åå½åç¨æ·id Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId"); Schedule schedule = new Schedule(); schedule.setUserId(userId); schedule.setScheduleTime(LocalDateTime.parse(time, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); schedule.setText(text); return scheduleMapper.insert(schedule); } //é¦é¡µ-->æçæ¥ç¨ @Override public List<Schedule> ScheduleByMe(String date) { //è·åå½åç¨æ·id Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId"); LocalDate localDate = LocalDate.parse(date, DateTimeFormatter.ofPattern("yyyy-MM-dd")); LocalDateTime startTime = localDate.atStartOfDay(); LocalDateTime endTime = localDate.plusDays(1).atStartOfDay().minusSeconds(1); return scheduleMapper.selectList(Wrappers.<Schedule>lambdaQuery().eq(Schedule::getUserId,userId).between(Schedule::getScheduleTime,startTime,endTime)); } } user-server/src/main/java/com/yuanchu/mom/mapper/ScheduleMapper.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,12 @@ package com.yuanchu.mom.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yuanchu.mom.pojo.Schedule; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; @Mapper @Repository public interface ScheduleMapper extends BaseMapper<Schedule> { } user-server/src/main/java/com/yuanchu/mom/pojo/Schedule.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,58 @@ 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.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; import java.time.LocalDateTime; @Data @Builder @AllArgsConstructor @NoArgsConstructor @TableName("schedule") public class Schedule extends OrderBy implements Serializable { @ApiModelProperty(value = "主é®") @TableId(type = IdType.AUTO) private Integer id; @ApiModelProperty(value = "å ³èç¨æ·id") private Integer userId; @ValueTableShow(1) @ApiModelProperty(value = "æ¥ç¨å 容") private String text; @ValueTableShow(2) @ApiModelProperty(value = "æ¥ç¨æ¶é´") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime scheduleTime; @ApiModelProperty(value = "åå»ºæ¥æ") @TableField(fill = FieldFill.INSERT) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; @ApiModelProperty(value = "æ´æ°æ¥æ") @TableField(fill = FieldFill.INSERT_UPDATE) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; @ApiModelProperty(value = "åå»ºç¨æ·") @TableField(fill = FieldFill.INSERT) private Integer createUser; @ApiModelProperty(value = "æ´æ°ç¨æ·") @TableField(fill = FieldFill.INSERT_UPDATE) private Integer updateUser; }