图片上传

snowy-web-app/src/main/java/vip/xiaonuo/modular/ai/carCapture/controller/CarCaptureController.java

@@ -26,7 +26,9 @@ import org.springframework.web.bind.annotation.RestController;
 import vip.xiaonuo.common.annotation.CommonLog;
 import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.common.pojo.CommonValidList;
+import vip.xiaonuo.core.param.OrgIdParam;
 import vip.xiaonuo.modular.ai.carCapture.entity.CarCapture;
+import vip.xiaonuo.modular.ai.carCapture.entity.vo.CarCapturePastVo;
 import vip.xiaonuo.modular.ai.carCapture.param.CarCaptureAddParam;
 import vip.xiaonuo.modular.ai.carCapture.param.CarCaptureEditParam;
 import vip.xiaonuo.modular.ai.carCapture.param.CarCaptureIdParam;
@@ -96,4 +98,18 @@ public class CarCaptureController {
     public CommonResult<CarCapture> detail(@Valid CarCaptureIdParam carCaptureIdParam) {
         return CommonResult.data(carCaptureService.detail(carCaptureIdParam));
     }
+
+    /**
+     * 获取过去12小时车辆识别
+     *
+     * @author newspaper
+     * @date  2023/12/29 09:42
+     */
+    @ApiOperationSupport(order = 6)
+    @ApiOperation("获取过去12小时车辆识别")
+    @SaCheckPermission("/ai/carCapture/getPastCapture")
+    @GetMapping("/ai/carCapture/getPastCapture")
+    public CommonResult<CarCapturePastVo> getPastCapture(@Valid OrgIdParam orgIdParam) {
+        return CommonResult.data(carCaptureService.getPastCapture(orgIdParam));
+    }
 }

snowy-web-app/src/main/java/vip/xiaonuo/modular/ai/carCapture/mapper/CarCaptureMapper.java

@@ -14,6 +14,9 @@ package vip.xiaonuo.modular.ai.carCapture.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import vip.xiaonuo.modular.ai.carCapture.entity.CarCapture;
+import vip.xiaonuo.modular.ai.carCapture.entity.vo.CarCaptureHourVo;
+
+import java.util.List;
 
 /**
  * 车辆识别Mapper接口
@@ -22,4 +25,5 @@ import vip.xiaonuo.modular.ai.carCapture.entity.CarCapture;
  * @date  2023/12/29 09:42
  **/
 public interface CarCaptureMapper extends BaseMapper<CarCapture> {
+    List<CarCaptureHourVo> listPast(String orgId);
 }

snowy-web-app/src/main/java/vip/xiaonuo/modular/ai/carCapture/mapper/mapping/CarCaptureMapper.xml

@@ -2,4 +2,17 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="vip.xiaonuo.modular.ai.carCapture.mapper.CarCaptureMapper">
 
+    <select id="listPast" resultType="vip.xiaonuo.modular.ai.carCapture.entity.vo.CarCaptureHourVo">
+        SELECT
+            DATE_FORMAT(cap_time, "%Y-%m-%d %H:00:00") AS time,
+            COUNT(*) as value
+        FROM
+            `car_capture`
+        WHERE
+            org_id = #{orgId} AND cap_time BETWEEN NOW() - INTERVAL 12 HOUR AND NOW()
+        GROUP BY
+            DATE_FORMAT(cap_time, "%Y-%m-%d %H:00:00");
+        ORDER BY
+            cap_time ASC
+    </select>
 </mapper>

snowy-web-app/src/main/java/vip/xiaonuo/modular/ai/carCapture/service/CarCaptureService.java

@@ -14,7 +14,9 @@ package vip.xiaonuo.modular.ai.carCapture.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import vip.xiaonuo.core.param.OrgIdParam;
 import vip.xiaonuo.modular.ai.carCapture.entity.CarCapture;
+import vip.xiaonuo.modular.ai.carCapture.entity.vo.CarCapturePastVo;
 import vip.xiaonuo.modular.ai.carCapture.param.CarCaptureAddParam;
 import vip.xiaonuo.modular.ai.carCapture.param.CarCaptureEditParam;
 import vip.xiaonuo.modular.ai.carCapture.param.CarCaptureIdParam;
@@ -77,4 +79,6 @@ public interface CarCaptureService extends IService<CarCapture> {
      * @date  2023/12/29 09:42
      **/
     CarCapture queryEntity(String id);
+
+    CarCapturePastVo getPastCapture(OrgIdParam orgIdParam);
 }

snowy-web-app/src/main/java/vip/xiaonuo/modular/ai/carCapture/service/impl/CarCaptureServiceImpl.java

@@ -19,13 +19,17 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
 import vip.xiaonuo.common.enums.CommonSortOrderEnum;
 import vip.xiaonuo.common.exception.CommonException;
 import vip.xiaonuo.common.page.CommonPageRequest;
+import vip.xiaonuo.core.param.OrgIdParam;
 import vip.xiaonuo.modular.ai.carCapture.entity.CarCapture;
+import vip.xiaonuo.modular.ai.carCapture.entity.vo.CarCaptureHourVo;
+import vip.xiaonuo.modular.ai.carCapture.entity.vo.CarCapturePastVo;
 import vip.xiaonuo.modular.ai.carCapture.mapper.CarCaptureMapper;
 import vip.xiaonuo.modular.ai.carCapture.param.CarCaptureAddParam;
 import vip.xiaonuo.modular.ai.carCapture.param.CarCaptureEditParam;
@@ -33,6 +37,8 @@ import vip.xiaonuo.modular.ai.carCapture.param.CarCaptureIdParam;
 import vip.xiaonuo.modular.ai.carCapture.param.CarCapturePageParam;
 import vip.xiaonuo.modular.ai.carCapture.service.CarCaptureService;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import java.util.List;
 
@@ -44,6 +50,8 @@ import java.util.List;
  **/
 @Service
 public class CarCaptureServiceImpl extends ServiceImpl<CarCaptureMapper, CarCapture> implements CarCaptureService {
+    @Autowired
+    private CarCaptureMapper carCaptureMapper;
 
     @Override
     public Page<CarCapture> page(CarCapturePageParam carCapturePageParam) {
@@ -99,4 +107,20 @@ public class CarCaptureServiceImpl extends ServiceImpl<CarCaptureMapper, CarCapt
         }
         return carCapture;
     }
+
+    @Override
+    public CarCapturePastVo getPastCapture(OrgIdParam orgIdParam) {
+        CarCapturePastVo carCapturePastVo = new CarCapturePastVo();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        // 获取当前时间
+        LocalDateTime currentTime = LocalDateTime.now();
+        // 计算12小时前的时间
+        LocalDateTime twelveHoursAgo = currentTime.minusHours(12);
+        String twelveHoursAgoFormatted = twelveHoursAgo.format(formatter);
+        long count = this.count(new QueryWrapper<CarCapture>().lambda().eq(CarCapture::getOrgId, orgIdParam.getOrgId()).ge(CarCapture::getCapTime, twelveHoursAgoFormatted));
+        carCapturePastVo.setTotal(count);
+        List<CarCaptureHourVo> carCaptureHourVos = carCaptureMapper.listPast(orgIdParam.getOrgId());
+        carCapturePastVo.setList(carCaptureHourVos);
+        return carCapturePastVo;
+    }
 }

snowy-web-app/src/main/java/vip/xiaonuo/modular/base/department/controller/DepartmentController.java

@@ -35,6 +35,7 @@ import vip.xiaonuo.sys.modular.user.entity.SysUser;
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -111,7 +112,7 @@ public class DepartmentController {
                                     @RequestParam(required = false) @ApiParam(value = "部门负责人") String departmentManager,
                                     @RequestParam(required = false) @ApiParam(value = "描述") String remarks,
                                     @RequestParam(required = false) @ApiParam(value = "排序码") Integer sortCode,
-                                    @RequestParam(value = "departmentImgUrl", required = false) @ApiParam(value = "部门图片") MultipartFile departmentImgUrl) {
+                                    @RequestParam(value = "departmentImgUrl", required = false) @ApiParam(value = "部门图片") MultipartFile departmentImgUrl) throws IOException {
         departmentService.add(departmentName,parentId,departmentRegion,detailLocation,departmentPhone,departmentManager,remarks,sortCode,departmentImgUrl,orgId);
         return CommonResult.ok();
     }
@@ -135,7 +136,7 @@ public class DepartmentController {
                                      @RequestParam(required = false) @ApiParam(value = "部门负责人") String departmentManager,
                                      @RequestParam(required = false) @ApiParam(value = "描述") String remarks,
                                      @RequestParam(required = false) @ApiParam(value = "排序码") Integer sortCode,
-                                     @RequestParam(value = "departmentImgUrl", required = false) @ApiParam(value = "部门图片") MultipartFile departmentImgUrl) {
+                                     @RequestParam(value = "departmentImgUrl", required = false) @ApiParam(value = "部门图片") MultipartFile departmentImgUrl) throws IOException {
         departmentService.edit(id,departmentName,parentId,departmentRegion,detailLocation,departmentPhone,departmentManager,remarks,sortCode,departmentImgUrl);
         return CommonResult.ok();
     }

snowy-web-app/src/main/java/vip/xiaonuo/modular/base/department/entity/Department.java

@@ -46,9 +46,8 @@ public class Department extends CommonEntity implements TransPojo {
     private String departmentName;
 
     /** 部门照片 */
-    @ApiModelProperty(value = "部门照片id", position = 3)
-    @Trans(type = TransType.SIMPLE, target = DevFile.class, fields = "thumbnail", alias = "img", ref = "departmentImgUrl")
-    private String departmentImgId;
+    @ApiModelProperty(value = "部门照片", position = 3)
+    private String departmentImgUrl;
 
     /** 上级部门ID */
     @ApiModelProperty(value = "上级部门ID", position = 4)
@@ -93,9 +92,4 @@ public class Department extends CommonEntity implements TransPojo {
     @ApiModelProperty(value = "上级部门", position = 13)
     @TableField(exist = false)
     private String parentName;
-
-    /** 部门照片 */
-    @ApiModelProperty(value = "部门照片", position = 3)
-    @TableField(exist = false)
-    private String departmentImgUrl;
 }

snowy-web-app/src/main/java/vip/xiaonuo/modular/base/department/service/DepartmentService.java

@@ -21,6 +21,7 @@ import vip.xiaonuo.modular.base.department.entity.Department;
 import vip.xiaonuo.modular.base.department.param.*;
 import vip.xiaonuo.sys.modular.user.entity.SysUser;
 
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -45,7 +46,7 @@ public interface DepartmentService extends IService<Department> {
      * @author newspaper
      * @date  2023/12/13 08:44
      */
-    void add(String departmentName, String parentId, String departmentRegion, String detailLocation, String departmentPhone, String departmentManager, String remarks, Integer sortCode, MultipartFile departmentImgUrl,String orgId);
+    void add(String departmentName, String parentId, String departmentRegion, String detailLocation, String departmentPhone, String departmentManager, String remarks, Integer sortCode, MultipartFile departmentImgUrl,String orgId) throws IOException;
 
     /**
      * 编辑部门
@@ -53,7 +54,7 @@ public interface DepartmentService extends IService<Department> {
      * @author newspaper
      * @date  2023/12/13 08:44
      */
-    void edit(String id,String departmentName, String parentId, String departmentRegion, String detailLocation, String departmentPhone, String departmentManager, String remarks, Integer sortCode, MultipartFile departmentImgUrl);
+    void edit(String id,String departmentName, String parentId, String departmentRegion, String detailLocation, String departmentPhone, String departmentManager, String remarks, Integer sortCode, MultipartFile departmentImgUrl) throws IOException;
 
     /**
      * 删除部门

snowy-web-app/src/main/java/vip/xiaonuo/modular/base/department/service/impl/DepartmentServiceImpl.java

@@ -44,11 +44,13 @@ import vip.xiaonuo.modular.base.department.entity.Department;
 import vip.xiaonuo.modular.base.department.mapper.DepartmentMapper;
 import vip.xiaonuo.modular.base.department.param.*;
 import vip.xiaonuo.modular.base.department.service.DepartmentService;
+import vip.xiaonuo.modular.bi.utils.UploadImage;
 import vip.xiaonuo.sys.core.enums.SysDataTypeEnum;
 import vip.xiaonuo.sys.modular.user.entity.SysUser;
 import vip.xiaonuo.sys.modular.user.mapper.SysUserMapper;
 
 import javax.validation.constraints.NotBlank;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -64,9 +66,10 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
 
     @Autowired
     private BizUserMapper bizUserMapper;
-
     @Autowired
     private DevFileService devFileService;
+    @Autowired
+    private UploadImage uploadImage;
 
     @Override
     public List<Tree<String>> tree(DepartmentOrgIdParam departmentOrgIdParam) {
@@ -104,7 +107,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void add(String departmentName, String parentId, String departmentRegion, String detailLocation, String departmentPhone, String departmentManager, String remarks, Integer sortCode, MultipartFile departmentImgUrl,String orgId) {
+    public void add(String departmentName, String parentId, String departmentRegion, String detailLocation, String departmentPhone, String departmentManager, String remarks, Integer sortCode, MultipartFile departmentImgUrl,String orgId) throws IOException {
         if (this.count(new QueryWrapper<Department>().lambda().eq(Department::getDepartmentName,departmentName)) > 0) {
             throw new CommonException("存在重复部门名称!");
         }
@@ -119,15 +122,15 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
         department.setSortCode(sortCode);
         department.setOrgId(orgId);
         if (ObjectUtil.isNotEmpty(departmentImgUrl)){
-            String uploadReturnUrl = devFileService.uploadReturnId(DevFileEngineTypeEnum.LOCAL.getValue(), departmentImgUrl);
-            department.setDepartmentImgId(uploadReturnUrl);
+            String uploadReturnUrl = uploadImage.getImageCom(departmentImgUrl);
+            department.setDepartmentImgUrl(uploadReturnUrl);
         }
         this.save(department);
     }
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void edit(String id,String departmentName, String parentId, String departmentRegion, String detailLocation, String departmentPhone, String departmentManager, String remarks, Integer sortCode, MultipartFile departmentImgUrl) {
+    public void edit(String id,String departmentName, String parentId, String departmentRegion, String detailLocation, String departmentPhone, String departmentManager, String remarks, Integer sortCode, MultipartFile departmentImgUrl) throws IOException {
         Department department = this.queryEntity(id);
         if (this.count(new QueryWrapper<Department>().lambda().eq(Department::getOrgId,department.getOrgId()).eq(Department::getDepartmentName,departmentName).ne(Department::getId,id)) > 0) {
             throw new CommonException("存在重复部门名称!");
@@ -141,8 +144,8 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
         department.setRemarks(remarks);
         department.setSortCode(sortCode);
         if (ObjectUtil.isNotEmpty(departmentImgUrl)){
-            String uploadReturnUrl = devFileService.uploadReturnId(DevFileEngineTypeEnum.LOCAL.getValue(), departmentImgUrl);
-            department.setDepartmentImgId(uploadReturnUrl);
+            String uploadReturnUrl = uploadImage.getImageCom(departmentImgUrl);
+            department.setDepartmentImgUrl(uploadReturnUrl);
         }
         this.updateById(department);
     }

snowy-web-app/src/main/java/vip/xiaonuo/modular/base/inventoryUse/controller/InventoryUseController.java

@@ -39,6 +39,7 @@ import vip.xiaonuo.modular.base.peoplelist.service.PeopleListService;
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
+import java.io.IOException;
 import java.text.ParseException;
 import java.util.Date;
 import java.util.List;
@@ -147,7 +148,7 @@ public class InventoryUseController {
     public CommonResult<String> revert(@RequestParam MultipartFile returnImgUrl,
                                        @RequestParam String id,
                                        @RequestParam String returnTime,
-                                       @RequestParam String remarks) throws ParseException {
+                                       @RequestParam String remarks) throws ParseException, IOException {
         inventoryUseService.revert(returnImgUrl,id,returnTime,remarks);
         return CommonResult.ok();
     }

snowy-web-app/src/main/java/vip/xiaonuo/modular/base/inventoryUse/entity/InventoryUse.java

@@ -103,8 +103,7 @@ public class InventoryUse extends CommonEntity implements TransPojo {
 
     /** 归还图片地址 */
     @ApiModelProperty(value = "归还图片地址", position = 14)
-    @Trans(type = TransType.SIMPLE, target = DevFile.class, fields = "thumbnail", alias = "img", ref = "returnImgUrl")
-    private String returnImgId;
+    private String returnImgUrl;
 
     /** 备注 */
     @ApiModelProperty(value = "备注", position = 15)
@@ -133,10 +132,4 @@ public class InventoryUse extends CommonEntity implements TransPojo {
     @ApiModelProperty(value = "领用人名称", position = 20)
     @TableField(exist = false)
     private String userName;
-
-
-    /** 归还图片地址 */
-    @ApiModelProperty(value = "归还图片地址", position = 21)
-    @TableField(exist = false)
-    private String returnImgUrl;
 }

snowy-web-app/src/main/java/vip/xiaonuo/modular/base/inventoryUse/service/InventoryUseService.java

@@ -20,6 +20,7 @@ import vip.xiaonuo.modular.base.inventoryUse.entity.vo.InventoryUseDetailVo;
 import vip.xiaonuo.modular.base.inventoryUse.entity.vo.InventoryUseVo;
 import vip.xiaonuo.modular.base.inventoryUse.param.*;
 
+import java.io.IOException;
 import java.text.ParseException;
 import java.util.Date;
 import java.util.List;
@@ -80,5 +81,5 @@ public interface InventoryUseService extends IService<InventoryUse> {
      **/
     InventoryUse queryEntity(String id);
 
-    void revert(MultipartFile returnImgUrl, String id, String returnTime, String remarks) throws ParseException;
+    void revert(MultipartFile returnImgUrl, String id, String returnTime, String remarks) throws ParseException, IOException;
 }

snowy-web-app/src/main/java/vip/xiaonuo/modular/base/inventoryUse/service/impl/InventoryUseServiceImpl.java

@@ -37,8 +37,10 @@ import vip.xiaonuo.modular.base.inventoryUse.entity.vo.InventoryUseVo;
 import vip.xiaonuo.modular.base.inventoryUse.mapper.InventoryUseMapper;
 import vip.xiaonuo.modular.base.inventoryUse.param.*;
 import vip.xiaonuo.modular.base.inventoryUse.service.InventoryUseService;
+import vip.xiaonuo.modular.bi.utils.UploadImage;
 
 import javax.validation.constraints.NotBlank;
+import java.io.IOException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -54,7 +56,7 @@ import java.util.List;
 public class InventoryUseServiceImpl extends ServiceImpl<InventoryUseMapper, InventoryUse> implements InventoryUseService {
 
     @Autowired
-    private DevFileService devFileService;
+    private UploadImage uploadImage;
 
     @Autowired
     private InventoryUseMapper inventoryUseMapper;
@@ -107,12 +109,15 @@ public class InventoryUseServiceImpl extends ServiceImpl<InventoryUseMapper, Inv
     }
 
     @Override
-    public void revert(MultipartFile returnImgUrl, String id, String returnTime, String remarks) throws ParseException {
+    public void revert(MultipartFile returnImgUrl, String id, String returnTime, String remarks) throws ParseException, IOException {
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         InventoryUse inventoryUse = this.getById(id);
-        String url = devFileService.uploadReturnId(DevFileEngineTypeEnum.LOCAL.getValue(), returnImgUrl);
+        String url = uploadImage.getImageCom(returnImgUrl);
+        if (url == "上传失败"){
+            throw new CommonException("图片上传失败！");
+        }
         inventoryUse.setReturnTime(dateFormat.parse(returnTime));
-        inventoryUse.setReturnImgId(url);
+        inventoryUse.setReturnImgUrl(url);
         inventoryUse.setRemarks(remarks);
         this.updateById(inventoryUse);
     }

snowy-web-app/src/main/java/vip/xiaonuo/modular/base/peoplelist/controller/PeopleListController.java

@@ -36,6 +36,7 @@ import vip.xiaonuo.modular.base.peoplelist.service.PeopleListService;
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
+import java.io.IOException;
 import java.util.Date;
 
 /**
@@ -90,7 +91,7 @@ public class PeopleListController {
                                     @RequestParam @ApiParam(value = "部门") String department,
                                     @RequestParam @ApiParam(value = "工作地点") String workLocation,
                                     @RequestParam @ApiParam(value = "员工照片") MultipartFile imgUrl,
-                                    @RequestParam @ApiParam(value = "组织id") String orgId) {
+                                    @RequestParam @ApiParam(value = "组织id") String orgId) throws IOException {
         peopleListService.add(userName, nickName, sex, idCard, phone, publicPhone, province, address, entryDate,
                 workStatus, job, department, workLocation, imgUrl,orgId);
         return CommonResult.ok();
@@ -120,7 +121,7 @@ public class PeopleListController {
                                      @RequestParam @ApiParam(value = "工作岗位") String job,
                                      @RequestParam @ApiParam(value = "部门") String department,
                                      @RequestParam @ApiParam(value = "工作地点") String workLocation,
-                                     @RequestParam @ApiParam(value = "员工照片") MultipartFile imgUrl) {
+                                     @RequestParam @ApiParam(value = "员工照片") MultipartFile imgUrl) throws IOException {
         peopleListService.edit(id,userName, nickName, sex, idCard, phone, publicPhone, province, address, entryDate,
                 workStatus, job, department, workLocation,  imgUrl);
         return CommonResult.ok();

snowy-web-app/src/main/java/vip/xiaonuo/modular/base/peoplelist/entity/PeopleList.java

@@ -110,8 +110,7 @@ public class PeopleList implements TransPojo {
 
     /** 员工图片id */
     @ApiModelProperty(value = "员工图片id", position = 20)
-    @Trans(type = TransType.SIMPLE, target = DevFile.class, fields = "thumbnail", alias = "img", ref = "imgUrl")
-    private String imgUrlId;
+    private String imgUrl;
 
     /** 组织id */
     @ApiModelProperty(value = "组织id", position = 21)
@@ -121,9 +120,4 @@ public class PeopleList implements TransPojo {
     @ApiModelProperty(value = "部门名称", position = 22)
     private String departmentName;
 
-    /** 员工照片 */
-    @ApiModelProperty(value = "员工照片", position = 23)
-    @TableField(exist = false)
-    private String imgUrl;
-
 }

snowy-web-app/src/main/java/vip/xiaonuo/modular/base/peoplelist/service/PeopleListService.java

@@ -23,6 +23,7 @@ import vip.xiaonuo.modular.base.peoplelist.param.PeopleListEditParam;
 import vip.xiaonuo.modular.base.peoplelist.param.PeopleListIdParam;
 import vip.xiaonuo.modular.base.peoplelist.param.PeopleListPageParam;
 
+import java.io.IOException;
 import java.util.Date;
 import java.util.List;
 
@@ -50,7 +51,7 @@ public interface PeopleListService extends IService<PeopleList> {
      */
     void add(String userName, String nickName, Integer sex, String idCard, String phone, String publicPhone,
              String province, String address, String entryDate, Integer workStatus, String job, String department,
-             String workLocation, MultipartFile imgUrl,String orgId);
+             String workLocation, MultipartFile imgUrl,String orgId) throws IOException;
 
     /**
      * 编辑people_list
@@ -60,7 +61,7 @@ public interface PeopleListService extends IService<PeopleList> {
      */
     void edit(String id,String userName, String nickName, Integer sex, String idCard, String phone, String publicPhone,
               String province, String address, String entryDate, Integer workStatus, String job, String department,
-              String workLocation, MultipartFile imgUrl);
+              String workLocation, MultipartFile imgUrl) throws IOException;
 
     /**
      * 删除people_list

snowy-web-app/src/main/java/vip/xiaonuo/modular/base/peoplelist/service/impl/PeopleListServiceImpl.java

@@ -38,7 +38,9 @@ import vip.xiaonuo.modular.base.peoplelist.param.PeopleListEditParam;
 import vip.xiaonuo.modular.base.peoplelist.param.PeopleListIdParam;
 import vip.xiaonuo.modular.base.peoplelist.param.PeopleListPageParam;
 import vip.xiaonuo.modular.base.peoplelist.service.PeopleListService;
+import vip.xiaonuo.modular.bi.utils.UploadImage;
 
+import java.io.IOException;
 import java.util.Date;
 import java.util.List;
 
@@ -55,6 +57,9 @@ public class PeopleListServiceImpl extends ServiceImpl<PeopleListMapper, PeopleL
     private DevFileService devFileService;
     @Autowired
     private DepartmentMapper departmentMapper;
+    @Autowired
+    private UploadImage uploadImage;
+
     @Override
     public Page<PeopleList> page(PeopleListPageParam peopleListPageParam) {
         QueryWrapper<PeopleList> queryWrapper = new QueryWrapper<>();
@@ -79,7 +84,7 @@ public class PeopleListServiceImpl extends ServiceImpl<PeopleListMapper, PeopleL
     @Override
     public void add(String userName, String nickName, Integer sex, String idCard, String phone, String publicPhone,
                     String province, String address, String entryDate, Integer workStatus, String job, String department,
-                    String workLocation, MultipartFile imgUrl,String orgId) {
+                    String workLocation, MultipartFile imgUrl,String orgId) throws IOException {
         if (this.count(new QueryWrapper<PeopleList>().lambda().eq(PeopleList::getNickName,nickName).eq(PeopleList::getOrgId,orgId)) > 0) {
             throw new CommonException("存在重复工号!");
         }
@@ -105,8 +110,8 @@ public class PeopleListServiceImpl extends ServiceImpl<PeopleListMapper, PeopleL
         people.setPhone(phone);
         people.setOrgId(orgId);
         if (ObjectUtil.isNotEmpty(imgUrl)){
-            String uploadReturnUrl = devFileService.uploadReturnId(DevFileEngineTypeEnum.LOCAL.getValue(), imgUrl);
-            people.setImgUrlId(uploadReturnUrl);
+            String uploadReturnUrl = uploadImage.getImageCom(imgUrl);
+            people.setImgUrl(uploadReturnUrl);
         }
         this.save(people);
 
@@ -116,7 +121,7 @@ public class PeopleListServiceImpl extends ServiceImpl<PeopleListMapper, PeopleL
     @Override
     public void edit(String id,String userName, String nickName, Integer sex, String idCard, String phone, String publicPhone,
                      String province, String address, String entryDate, Integer workStatus, String job, String department,
-                     String workLocation, MultipartFile imgUrl) {
+                     String workLocation, MultipartFile imgUrl) throws IOException {
         PeopleList people = this.queryEntity(id);
         if (this.count(new QueryWrapper<PeopleList>().lambda().eq(PeopleList::getNickName,nickName).ne(PeopleList::getId,id)) > 0) {
             throw new CommonException("存在重复工号!");
@@ -141,8 +146,8 @@ public class PeopleListServiceImpl extends ServiceImpl<PeopleListMapper, PeopleL
         people.setWorkLocation(workLocation);
         people.setPhone(phone);
         if (ObjectUtil.isNotEmpty(imgUrl)){
-            String uploadReturnUrl = devFileService.uploadReturnId(DevFileEngineTypeEnum.LOCAL.getValue(), imgUrl);
-            people.setImgUrlId(uploadReturnUrl);
+            String uploadReturnUrl = uploadImage.getImageCom(imgUrl);
+            people.setImgUrl(uploadReturnUrl);
         }
         this.updateById(people);
     }

snowy-web-app/src/main/java/vip/xiaonuo/modular/energy/energyElectricity/entity/vo/EnergyElectricityTrendVo.java

@@ -12,6 +12,6 @@ public class EnergyElectricityTrendVo {
     private String location;
 
     @ApiModelProperty(value = "数据", position = 2)
-    private List<EnergyElectricityListVo> energyElectricityList;
+    private List<EnergyElectricityListVo> list;
 
 }

snowy-web-app/src/main/java/vip/xiaonuo/modular/energy/energyElectricity/mapper/mapping/EnergyElectricityMapper.xml

@@ -84,7 +84,12 @@
         WHERE
             DATE(create_date) = CURRENT_DATE
             AND org_id = #{orgId}
-            AND (LENGTH(#{pigpenList}) = 0 OR unit_id IN (#{pigpenList}))
+            <if test="pigpenList != null and pigpenList.size > 0">
+                AND unit_id IN
+                <foreach collection="pigpenList" item="pigpenId" index="i" open="(" close=")" separator=",">
+                    #{pigpenId}
+                </foreach>
+            </if>
         ORDER BY
          createTime ASC
     </select>
@@ -98,7 +103,12 @@
         WHERE
             YEARWEEK(create_date, 1) = YEARWEEK(CURDATE(), 1)
             AND org_id = #{orgId}
-            AND (LENGTH(#{pigpenList}) = 0 OR unit_id IN (#{pigpenList}))
+            <if test="pigpenList != null and pigpenList.size > 0">
+                AND unit_id IN
+                <foreach collection="pigpenList" item="pigpenId" index="i" open="(" close=")" separator=",">
+                    #{pigpenId}
+                </foreach>
+            </if>
         GROUP BY
             DATE(create_date)
         ORDER BY
@@ -114,7 +124,12 @@
             MONTH(create_date) = MONTH(CURDATE())
             AND YEAR(create_date) = YEAR(CURDATE())
             AND org_id = #{orgId}
-            AND (LENGTH(#{pigpenList}) = 0 OR unit_id IN (#{pigpenList}))
+            <if test="pigpenList != null and pigpenList.size > 0">
+                AND unit_id IN
+                <foreach collection="pigpenList" item="pigpenId" index="i" open="(" close=")" separator=",">
+                    #{pigpenId}
+                </foreach>
+            </if>
         GROUP BY
             DATE(create_date)
         ORDER BY
@@ -130,7 +145,12 @@
         WHERE
             create_date BETWEEN #{startDate} AND #{endDate}
             AND org_id = #{orgId}
-            AND (LENGTH(#{pigpenList}) = 0 OR unit_id IN (#{pigpenList}))
+            <if test="pigpenList != null and pigpenList.size > 0">
+                AND unit_id IN
+                <foreach collection="pigpenList" item="pigpenId" index="i" open="(" close=")" separator=",">
+                    #{pigpenId}
+                </foreach>
+            </if>
         GROUP BY
             DATE(create_date)
         ORDER BY
@@ -228,7 +248,12 @@
         WHERE
             create_date BETWEEN CURDATE() - INTERVAL 6 DAY AND CURDATE();
             AND org_id = #{orgId}
-            AND (LENGTH(#{pigpenList}) = 0 OR unit_id IN (#{pigpenList}))
+            <if test="pigpenList != null and pigpenList.size > 0">
+                AND unit_id IN
+                <foreach collection="pigpenList" item="pigpenId" index="i" open="(" close=")" separator=",">
+                    #{pigpenId}
+                </foreach>
+            </if>
         GROUP BY
             DATE(create_date)
         ORDER BY

snowy-web-app/src/main/java/vip/xiaonuo/modular/energy/energyElectricity/service/impl/EnergyElectricityServiceImpl.java

@@ -152,7 +152,7 @@ public class EnergyElectricityServiceImpl extends ServiceImpl<EnergyElectricityM
             energyElectricityList = energyElectricityMapper.listSevenDay(pigpenList,orgId);
         }
         electricityTrend.setLocation(location);
-        electricityTrend.setEnergyElectricityList(energyElectricityList);
+        electricityTrend.setList(energyElectricityList);
         return electricityTrend;
     }
 

snowy-web-app/src/main/java/vip/xiaonuo/modular/energy/energyWater/mapper/mapping/EnergyWaterMapper.xml

@@ -83,7 +83,12 @@
         WHERE
             DATE(create_date) = CURRENT_DATE
             AND org_id = #{orgId}
-            AND (LENGTH(#{pigpenList}) = 0 OR unit_id IN (#{pigpenList}))
+            <if test="pigpenList != null and pigpenList.size > 0">
+                AND unit_id IN
+                <foreach collection="pigpenList" item="pigpenId" index="i" open="(" close=")" separator=",">
+                    #{pigpenId}
+                </foreach>
+            </if>
         ORDER BY
          createTime ASC
     </select>
@@ -97,7 +102,12 @@
         WHERE
             YEARWEEK(create_date, 1) = YEARWEEK(CURDATE(), 1)
             AND org_id = #{orgId}
-            AND (LENGTH(#{pigpenList}) = 0 OR unit_id IN (#{pigpenList}))
+            <if test="pigpenList != null and pigpenList.size > 0">
+                AND unit_id IN
+                <foreach collection="pigpenList" item="pigpenId" index="i" open="(" close=")" separator=",">
+                    #{pigpenId}
+                </foreach>
+            </if>
         GROUP BY
             DATE(create_date)
         ORDER BY
@@ -114,7 +124,12 @@
             MONTH(create_date) = MONTH(CURDATE())
             AND YEAR(create_date) = YEAR(CURDATE())
             AND org_id = #{orgId}
-            AND (LENGTH(#{pigpenList}) = 0 OR unit_id IN (#{pigpenList}))
+            <if test="pigpenList != null and pigpenList.size > 0">
+                AND unit_id IN
+                <foreach collection="pigpenList" item="pigpenId" index="i" open="(" close=")" separator=",">
+                    #{pigpenId}
+                </foreach>
+            </if>
         GROUP BY
             DATE(create_date)
         ORDER BY
@@ -129,7 +144,12 @@
         WHERE
             create_date BETWEEN #{startDate} AND #{endDate}
             AND org_id = #{orgId}
-            AND (LENGTH(#{pigpenList}) = 0 OR unit_id IN (#{pigpenList}))
+            <if test="pigpenList != null and pigpenList.size > 0">
+                AND unit_id IN
+                <foreach collection="pigpenList" item="pigpenId" index="i" open="(" close=")" separator=",">
+                    #{pigpenId}
+                </foreach>
+            </if>
         GROUP BY
             DATE(create_date)
         ORDER BY
@@ -224,7 +244,12 @@
         WHERE
             create_date BETWEEN CURDATE() - INTERVAL 6 DAY AND CURDATE();
             AND org_id = #{orgId}
-            AND (LENGTH(#{pigpenList}) = 0 OR unit_id IN (#{pigpenList}))
+            <if test="pigpenList != null and pigpenList.size > 0">
+                AND unit_id IN
+                <foreach collection="pigpenList" item="pigpenId" index="i" open="(" close=")" separator=",">
+                    #{pigpenId}
+                </foreach>
+            </if>
         GROUP BY
             DATE(create_date)
         ORDER BY

snowy-web-app/src/main/java/vip/xiaonuo/modular/warning/warningInfo/entity/WarningInfo.java

@@ -19,6 +19,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import vip.xiaonuo.common.pojo.CommonEntity;
+import vip.xiaonuo.modular.base.baseConfig.entity.BaseConfig;
 import vip.xiaonuo.modular.base.pigpen.entity.BasePigpen;
 
 import java.math.BigDecimal;
@@ -40,9 +41,10 @@ public class WarningInfo extends CommonEntity {
     @ApiModelProperty(value = "id", position = 1)
     private String id;
 
-    /** 预警类型 */
-    @ApiModelProperty(value = "预警类型", position = 2)
-    private String warningType;
+    /** 预警类型id */
+    @ApiModelProperty(value = "预警类型id", position = 2)
+    @Trans(type = TransType.SIMPLE,target = BaseConfig.class,fields = "configName", alias = "warning", ref = "warningType")
+    private String warningTypeId;
 
     /** 预警内容 */
     @ApiModelProperty(value = "预警内容", position = 3)
@@ -72,4 +74,9 @@ public class WarningInfo extends CommonEntity {
     @ApiModelProperty(value = "通知人名称", position = 9)
     @TableField(exist = false)
     private String warningNotifierName;
+
+    /** 预警类型 */
+    @ApiModelProperty(value = "预警类型", position = 10)
+    @TableField(exist = false)
+    private String warningType;
 }