flower_city/src/main/java/com/dg/core/db/gen/mapper/OrganizationChartMapper.java
@@ -62,7 +62,7 @@ /** * 根据所属地区查找部门 */ List<OrganizationChartEntity> selectByCode(@Param("areaCode") String areaCode); List<OrganizationChartEntity> selectByCode(@Param("id")String id, @Param("areaCode") String areaCode);
@@ -74,8 +74,8 @@ } if (isAdd) { //自动分配业务代码开始 List<OrganizationChartEntity> organizationChartEntities = organizationChartMapper.selectByCode(guideRepairOrder.getAreaCode()); if (organizationChartEntities != null) { List<OrganizationChartEntity> organizationChartEntities = organizationChartMapper.selectByCode(transactionEvent.getDepartmentId(),guideRepairOrder.getAreaCode()); if (organizationChartEntities.size() > 0) { for (OrganizationChartEntity organizationChart : organizationChartEntities) { departmentIds.add(organizationChart.getId().toString()); } @@ -216,6 +216,7 @@ @Override public int updateSysUserOrderNum(GuideEvolveEntity order) { if (order.getState() != null) { if (order.getState().equals("11")) { SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, order.getToUserId())); GuideRepairOrder guideRepairOrder = baseMapper.selectOne(new QueryWrapper<GuideRepairOrder>().lambda() @@ -246,6 +247,7 @@ sysUserFrom.setTransactionNum(sysUserFrom.getTransactionNum() - 1); return sysUserMapper.updateById(sysUserFrom); } } return 0; }
@@ -94,7 +94,7 @@ <select id="selectByCode" resultMap="OrganizationChartResult"> <include refid="selectOrganizationChartVo"/> <where> city=#{areaCode} or district= #{areaCode} or village=#{areaCode} id=#{id} and (city=#{areaCode} or district= #{areaCode} or village=#{areaCode}) </where> </select>
File was deleted springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
@@ -178,10 +178,12 @@ String extension = FilenameUtils.getExtension(file.getOriginalFilename()); String uuid=UUID.randomUUID().toString().replaceAll("-", ""); String name = uuid + "."+ extension; minioUtil.upload(file, name); String fileName = minioUtil.uploadRetFileName(file, name); Thumbnails.of(file.getInputStream()).scale(0.5).outputQuality(0.71).outputFormat("jpg").toFile(uuid+"_compress"); File file1=new File(uuid+"_compress.jpg"); String imageUrl = minioUtil.uploadFile(file1, uuid+"_compress.jpg"); //上传完压缩图后把原图清理，防止文件服务器资源爆满 minioUtil.removeMinio(fileName); return R.ok(imageUrl); } catch (Exception e) { log.error("上传照片失败【{}】", e.getMessage()); springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/MinioUtil.java
@@ -39,8 +39,7 @@ /** * 文件上传 * * @param file * 要上传的文件 * @param file 要上传的文件 * @return */ public String upload(MultipartFile file, String name) { @@ -74,8 +73,42 @@ /** * 文件上传 * * @param file * 要上传的文件 * @param file 要上传的文件 * @return */ public String uploadRetFileName(MultipartFile file, String name) { if (null != file) { try { UUID uuid = UUID.randomUUID(); StringBuilder s = new StringBuilder(); s.append(uuid.toString().replace("-", "")).append("/"); MinioClient minioClient = new MinioClient(minioProperties.getHost(), minioProperties.getAccessKey(), minioProperties.getSecretKey()); // bucket 不存在，创建 if (!minioClient.bucketExists(minioProperties.getBucket())) { minioClient.makeBucket(minioProperties.getBucket()); } // 得到文件流 InputStream input = file.getInputStream(); // 文件名 // String fileName = uuid + "/images." + FilenameUtils.getExtension(file.getOriginalFilename()); String fileName = s.append(name).toString(); String contentType = file.getContentType(); minioClient.putObject(minioProperties.getBucket(), fileName, input, contentType); StringBuilder fileUrl = new StringBuilder(minioProperties.getUrl()); String url = fileUrl.append(fileName).toString(); return fileName; } catch (Exception e) { e.printStackTrace(); } } return null; } /** * 文件上传 * * @param file 要上传的文件 * @return */ public String uploadFile(File file, String name) { @@ -154,4 +187,27 @@ } return bytes; } /** * 删除 * * @param fileName * @return * @throws Exception */ public String removeMinio(String fileName) { try { //创建MinioClient对象 //fileName = "6edbdf8c2a1146ddaf4fbfcb30f804ad/72b2a44c18a54802854931a65b604576.jpg" MinioClient minioClient = new MinioClient(minioProperties.getHost(), minioProperties.getAccessKey(), minioProperties.getSecretKey()); minioClient.removeObject(minioProperties.getBucket(), fileName); return "success"; } catch (Exception e) { e.printStackTrace(); return e.getMessage(); } } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleWestDOMapper.xml
@@ -96,6 +96,9 @@ <if test='neighborCircleAdminDTO.releaseContent != null and neighborCircleAdminDTO.releaseContent != ""'> and nc.release_content like concat('%',#{neighborCircleAdminDTO.releaseContent},'%') </if> <if test='neighborCircleAdminDTO.topicId != null '> and canc.topic_id = #{neighborCircleAdminDTO.topicId} </if> <if test='neighborCircleAdminDTO.topicName != null and neighborCircleAdminDTO.topicName != ""'> and canct.`name` = #{neighborCircleAdminDTO.topicName} </if> @@ -110,6 +113,20 @@ <if test='neighborCircleAdminDTO.status != null '> and nc.status = #{neighborCircleAdminDTO.status} </if> <if test='neighborCircleAdminDTO.belongType != null '> and nc.belong_type = #{neighborCircleAdminDTO.belongType} </if> <if test="neighborCircleAdminDTO.solveStatus !=null"> <if test="neighborCircleAdminDTO.solveStatus ==1"> and nc.solve_status in (0,1) </if> <if test="neighborCircleAdminDTO.solveStatus ==2"> and nc.solve_status =2 </if> <if test="neighborCircleAdminDTO.solveStatus ==3"> and nc.solve_status in(3,4) </if> </if> </where> order by case when nc.`status`=1 then 0 else 1 end, xxl-job-admin/xxl-job-admin.iml
File was deleted
