更新

winsea-haixin-platform-backend/src/main/java/com/yh/saas/platform/service/impl/FlowTaskCandidateServiceImpl.java

@@ -222,7 +222,7 @@ public class FlowTaskCandidateServiceImpl implements IFlowTaskCandidateService {
 		List<String> staffIds = Lists.newArrayList(staffMap.keySet());
 		// 只获取主要职务
 		List<CommonStaffRole> staffRoles = staffRoleService.findStaffRoles(staffIds).stream()
-				.filter(staffRole -> staffRole.getRoleMajor().equals("1")).collect(Collectors.toList());
+				.filter(staffRole -> "1".equals(staffRole.getRoleMajor())).collect(Collectors.toList());
 		Set<String> roleIds = staffRoles.stream().map(CommonStaffRole::getRoleId).collect(Collectors.toSet());
 
 		flowTaskCandidateStaffView.getStaffs().clear();

winsea-haixin-plugin-base/src/main/java/com/winsea/svc/common/config/WebConfig.java

@@ -43,7 +43,7 @@ public class WebConfig {
 				res.setHeader("Access-Control-Allow-Credentials", "true");
 				res.setHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT, OPTIONS");
 				res.setHeader("Access-Control-Allow-Headers", allowedHeaders);
-				if (req.getMethod().equals("OPTIONS")) {
+				if ("OPTIONS".equals(req.getMethod())) {
 					response.getWriter().println("ok");
 					return;
 				}

winsea-haixin-plugin-base/src/main/java/com/winsea/svc/common/international/InternationalResourceProviderAdapter.java

@@ -236,7 +236,9 @@ public class InternationalResourceProviderAdapter {
 			result.add(type);
 			result.addAll(getAllSuperTypes(type.getSuperclass()));
 			for (Class<?> ifc : type.getInterfaces())
+			{
 				result.addAll(getAllSuperTypes(ifc));
+			}
 		}
 		return result;
 	}
@@ -247,7 +249,9 @@ public class InternationalResourceProviderAdapter {
 	private Set<Field> getAllFields(final Class<?> type) {
 		Set<Field> result = Sets.newHashSet();
 		for (Class<?> t : getAllSuperTypes(type))
+		{
 			result.addAll(Sets.newHashSet(t.getDeclaredFields()));
+		}
 		return result;
 	}
 

winsea-haixin-plugin-base/src/main/java/com/yh/saas/plugin/base/service/impl/ExportCommonStylesImpl.java

@@ -421,10 +421,10 @@ public class ExportCommonStylesImpl {
                 // 将照片写入输出字节流中
                 ImageIO.write(bi, imgType.toUpperCase(), bos);
 
-                if (imgType.equals("jpg") || imgType.equals("jpeg")) {
+                if ("jpg".equals(imgType) || "jpeg".equals(imgType)) {
                     // 创建照片
                     patriarch.createPicture(anchor, workBook.addPicture(bos.toByteArray(), workBook.PICTURE_TYPE_JPEG));
-                } else if (imgType.equals("png")) {
+                } else if ("png".equals(imgType)) {
                     // 创建照片
                     patriarch.createPicture(anchor, workBook.addPicture(bos.toByteArray(), workBook.PICTURE_TYPE_PNG));
                 }
@@ -448,10 +448,10 @@ public class ExportCommonStylesImpl {
                     // 将照片写入输出字节流中
                     ImageIO.write(BufferImg, imgType.toUpperCase(), bos);
 
-                    if (imgType.equals("jpg") || imgType.equals("jpeg")) {
+                    if ("jpg".equals(imgType) || "jpeg".equals(imgType)) {
                         // 创建照片
                         patriarch.createPicture(anchor, workBook.addPicture(bos.toByteArray(), workBook.PICTURE_TYPE_JPEG));
-                    } else if (imgType.equals("png")) {
+                    } else if ("png".equals(imgType)) {
                         // 创建照片
                         patriarch.createPicture(anchor, workBook.addPicture(bos.toByteArray(), workBook.PICTURE_TYPE_PNG));
                     }

winsea-haixin-plugin-base/src/main/java/com/yh/saas/plugin/base/utils/ConvertUpMoney.java

@@ -115,8 +115,10 @@ public class ConvertUpMoney {
         for (int i = 0; i < length; i++) {
             String key = "";
             if (integers[i] == 0) {
-                if ((length - i) == 13)//万（亿）
+                if ((length - i) == 13){
+                    //万（亿）
                     key = IUNIT[4];
+                }
                 else if ((length - i) == 9) {//亿
                     key = IUNIT[8];
                 } else if ((length - i) == 5 && isWan) {//万

winsea-haixin-plugin-clouddisk/src/main/java/com/yh/saas/plugin/clouddisk/service/impl/DataManagerFolderServiceImpl.java

@@ -72,7 +72,7 @@ public class DataManagerFolderServiceImpl extends ServiceImpl<DataManagerFolderM
     public void removeFolderFile(List<DataManagerFolderFileView> list) {
         if (!list.isEmpty()) {
             list.forEach(dataManagerFolderFileView -> {
-                if (dataManagerFolderFileView.getType().equals("FOLDER")) {
+                if ("FOLDER".equals(dataManagerFolderFileView.getType())) {
                     DataManagerFolder dataManagerFolder = new DataManagerFolder();
                     dataManagerFolder.setFolderId(dataManagerFolderFileView.getId());
                     this.remove(dataManagerFolder);
@@ -88,7 +88,7 @@ public class DataManagerFolderServiceImpl extends ServiceImpl<DataManagerFolderM
     public void moveFolder(List<DataManagerFolderFileView> list) {
         if (!list.isEmpty()){
             list.stream().forEach(dataManagerFolderFileView->{
-                if (dataManagerFolderFileView.getType().equals("FOLDER")){
+                if ("FOLDER".equals(dataManagerFolderFileView.getType())){
                     DataManagerFolder dataManagerFolder = this.selectById(dataManagerFolderFileView.getId());
                     if (null == dataManagerFolder) {
                         throw new DataManagerException(DataManagerExceptionEnums.DATA_MANAGER_ID_NULL);
@@ -154,10 +154,10 @@ public class DataManagerFolderServiceImpl extends ServiceImpl<DataManagerFolderM
         if (!StringUtils.isEmpty(fileName)){
             wrapper.like(DataManagerFolder.QueryFields.FOLDER_NAME,fileName);
         }
-        if (!StringUtils.isEmpty(orderColumn) && orderColumn.equals("createDate")){
-            wrapper.orderBy(DataManagerFolder.QueryFields.CREATE_DATE,StringUtils.isEmpty(orderBy) || orderBy.equals("ASC")?true:false);
-        }else if (!StringUtils.isEmpty(orderColumn) && orderColumn.equals("fileName")){
-            wrapper.orderBy("CONVERT(name USING gbk)",StringUtils.isEmpty(orderBy) || orderBy.equals("ASC")?true:false);
+        if (!StringUtils.isEmpty(orderColumn) && "createDate".equals(orderColumn)){
+            wrapper.orderBy(DataManagerFolder.QueryFields.CREATE_DATE,StringUtils.isEmpty(orderBy) || "ASC".equals(orderBy)?true:false);
+        }else if (!StringUtils.isEmpty(orderColumn) && "fileName".equals(orderColumn)){
+            wrapper.orderBy("CONVERT(name USING gbk)",StringUtils.isEmpty(orderBy) || "ASC".equals(orderBy)?true:false);
         }else{
             wrapper.orderBy(DataManagerFolder.QueryFields.CREATE_DATE,false);
             wrapper.orderBy("CONVERT(name USING gbk)",true);

winsea-haixin-plugin-configuration/src/main/java/com/yh/saas/plugin/configuration/announcement/service/impl/AnnoIssueInfoServiceImpl.java

@@ -165,7 +165,7 @@ public class AnnoIssueInfoServiceImpl extends ServiceImpl<AnnoIssueInfoMapper, A
 		List<Recipient> recipients = annoIssueInfo.getRecipients();
 		annoIssueInfo.setReleaseRange(JSON.toJSONString(recipients));
 
-		if (!StringUtils.isEmpty(annoIssueInfo.getIsIssue()) && annoIssueInfo.getIsIssue().equals("1")) {
+		if (!StringUtils.isEmpty(annoIssueInfo.getIsIssue()) && "1".equals(annoIssueInfo.getIsIssue())) {
 			release(annoIssueInfo);
 		}
 
@@ -186,7 +186,7 @@ public class AnnoIssueInfoServiceImpl extends ServiceImpl<AnnoIssueInfoMapper, A
 		List<Recipient> recipients = annoIssueInfo.getRecipients();
 		annoIssueInfo.setReleaseRange(JSON.toJSONString(recipients));
 
-		if (!StringUtils.isEmpty(annoIssueInfo.getIsIssue()) && annoIssueInfo.getIsIssue().equals("1")) {
+		if (!StringUtils.isEmpty(annoIssueInfo.getIsIssue()) && "1".equals(annoIssueInfo.getIsIssue())) {
 			release(annoIssueInfo);
 		}
 

winsea-haixin-plugin-news/src/main/java/com/yh/saas/plugin/news/service/impl/NewsAnnoIssueInfoServiceImpl.java

@@ -211,7 +211,7 @@ public class NewsAnnoIssueInfoServiceImpl extends ServiceImpl<NewsAnnoIssueInfoM
             }
         }
 
-        if (!StringUtils.isEmpty(annoIssueInfo.getIsIssue()) && annoIssueInfo.getIsIssue().equals("1")) {
+        if (!StringUtils.isEmpty(annoIssueInfo.getIsIssue()) && "1".equals(annoIssueInfo.getIsIssue())) {
             release(annoIssueInfo);
         }
         return this.insert(annoIssueInfo);
@@ -229,7 +229,7 @@ public class NewsAnnoIssueInfoServiceImpl extends ServiceImpl<NewsAnnoIssueInfoM
         List<Recipient> recipients = annoIssueInfo.getRecipients();
         annoIssueInfo.setReleaseRange(JSON.toJSONString(recipients));
 
-        if (!StringUtils.isEmpty(annoIssueInfo.getIsIssue()) && annoIssueInfo.getIsIssue().equals("1")) {
+        if (!StringUtils.isEmpty(annoIssueInfo.getIsIssue()) && "1".equals(annoIssueInfo.getIsIssue())) {
             release(annoIssueInfo);
         }
 

winsea-haixin-plugin-news/src/main/java/com/yh/saas/plugin/news/service/impl/NewsAnnouncementInfoServiceImpl.java

@@ -196,7 +196,7 @@ public class NewsAnnouncementInfoServiceImpl extends ServiceImpl<NewsAnnouncemen
         commonIssueInfo.setId(IdGenerator.generateUUID());
         commonIssueInfo.setIssueDate(new Date());
         getDefaultNews(commonIssueInfo.getDefaultNews());// 清除之前相同的默认新闻
-        if (!StringUtils.isEmpty(commonIssueInfo.getIsIssue()) && commonIssueInfo.getIsIssue().equals("1")) {
+        if (!StringUtils.isEmpty(commonIssueInfo.getIsIssue()) && "1".equals(commonIssueInfo.getIsIssue())) {
             release(commonIssueInfo);
         }
         this.insert(commonIssueInfo);
@@ -214,7 +214,7 @@ public class NewsAnnouncementInfoServiceImpl extends ServiceImpl<NewsAnnouncemen
     public String updateCommonIssueInfo(CommonAnnouncementIssueInfo commonIssueInfo) {
         commonIssueInfo.setIssueDate(new Date());
         getDefaultNews(commonIssueInfo.getDefaultNews());// 清除之前相同的默认新闻
-        if (!StringUtils.isEmpty(commonIssueInfo.getIsIssue()) && commonIssueInfo.getIsIssue().equals("1")) {
+        if (!StringUtils.isEmpty(commonIssueInfo.getIsIssue()) && "1".equals(commonIssueInfo.getIsIssue())) {
             release(commonIssueInfo);
         }
         this.updateById(commonIssueInfo);

winsea-haixin-plugin-operation/src/main/java/com/yh/saas/plugin/operation/service/impl/OperationTenantServiceImpl.java

@@ -582,7 +582,7 @@ public class OperationTenantServiceImpl implements IOperationTenantService {
                 null == opr ? null : opr.getOperatorMobilePhone());
         if (StringUtils.isNotBlank(tenant.getContractEndDate())) {
             Date endDate = sdf.parse(tenant.getContractEndDate());
-            tenant.setDaysRemaining((int) ((endDate.getTime() - new Date().getTime()) / (24 * 3600 * 1000)));
+            tenant.setDaysRemaining((int) ((endDate.getTime() - System.currentTimeMillis()) / (24 * 3600 * 1000)));
         }
         Wrapper<CommonCompany> wrapperComp = new EntityWrapper<>();
         wrapperComp.eq(CommonCompany.QueryFields.TENANT_ID, tenantId);

winsea-haixin-plugin-servicer/src/main/java/com/yh/saas/plugin/servicer/service/impl/ServicerMerchantInfoServiceImpl.java

@@ -336,7 +336,7 @@ public class ServicerMerchantInfoServiceImpl extends ServiceImpl<ServicerMerchan
 
                 }
             }
-            if (newServicerMerchantInfo.getStatusFlag().equals("5")) {// 判断是否再次编辑
+            if ("5".equals(newServicerMerchantInfo.getStatusFlag())) {// 判断是否再次编辑
                 if (merchantInfoView.getOnlySubmit() == true) {
                     // 设置服务商状态，已提交
                     merchantInfo.setStatusFlag(ServicerStatusEnum.SUBMITED.getFlag());
@@ -906,7 +906,7 @@ public class ServicerMerchantInfoServiceImpl extends ServiceImpl<ServicerMerchan
             Object[] registerVendors = SupplyWebServiceClient.getData(registerWebServiceUrl, "validateVendorRegister",
                     mobileNumber);
             if (registerVendors != null && registerVendors.length > 0 && registerVendors[0] != null
-                    && !registerVendors[0].toString().equalsIgnoreCase("null")) {
+                    && !"null".equalsIgnoreCase(registerVendors[0].toString())) {
                 // 返回的是json格式的字符串
                 String companyInfo = registerVendors[0].toString();
                 // 如果已注册，则返回注册的公司信息

winsea-haixin-plugin-servicer/src/main/java/com/yh/saas/plugin/servicer/ws/client/SupplyWsClientAuthHandler.java

@@ -25,6 +25,7 @@ public class SupplyWsClientAuthHandler implements CallbackHandler {
      */
     private static final String WEBSERVICE_USERPASS = "yh_webservice_userpass";
 
+    @Override
     public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
         for (int i = 0; i < callbacks.length; i++) {
             WSPasswordCallback ps = (WSPasswordCallback) callbacks[i];

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/BDAccessToken.java

@@ -61,8 +61,8 @@ public class BDAccessToken {
              */
             System.err.println("result:" + result);
             JSONObject jsonObject = JSON.parseObject(result);
-            String access_token = jsonObject.getString("access_token");
-            return access_token;
+            String accessToken = jsonObject.getString("access_token");
+            return accessToken;
         } catch (Exception e) {
             System.err.printf("获取token失败！");
             e.printStackTrace(System.err);

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/AcquisitionInfo.java

@@ -1,7 +1,6 @@
 package com.yh.saas.plugin.yiliangyiyun.entity;
 
 import java.io.Serializable;
-import java.util.List;
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
@@ -14,9 +13,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * <p>
  * 记录收购信息
- * </p>
  *
  * @author Gdc
  * @since 2021-11-26

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/AcquisitionInfoServiceImpl.java

@@ -1,8 +1,6 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
 import com.google.common.collect.Lists;
 import com.winsea.svc.base.base.entity.CommonStaff;
 import com.winsea.svc.base.base.entity.CommonStaffRole;
@@ -16,20 +14,15 @@ import com.winsea.svc.notice.service.INoticeService;
 import com.winsea.svc.notice.service.INoticeTaskService;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.common.support.util.StringUtils;
-import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.*;
-import com.yh.saas.plugin.yiliangyiyun.entity.view.ExportVView;
-import com.yh.saas.plugin.yiliangyiyun.entity.view.WarehouseView;
 import com.yh.saas.plugin.yiliangyiyun.mapper.AcquisitionInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IAcquisitionInfoService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.yh.saas.plugin.yiliangyiyun.service.IFocusAcquisitionInformationService;
-import com.yh.saas.plugin.yiliangyiyun.service.IWarehouseBaseInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CollectionWarehousingRecordServiceImpl.java

@@ -338,13 +338,13 @@ public class CollectionWarehousingRecordServiceImpl extends ServiceImpl<Collecti
         fontTitle.setFontName("宋体");
         fontTitle.setFontHeightInPoints((short) 14);
         // 设置字体加粗
-        fontTitle.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
+        fontTitle.setBold(true);
 
         HSSFFont fontComp = wb.createFont();
         fontComp.setFontName("宋体");
         fontComp.setFontHeightInPoints((short) 16);
         // 设置字体加粗
-        fontComp.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
+        fontComp.setBold(true);
 
         HSSFFont fontDetail = wb.createFont();
         fontDetail.setFontName("宋体");
@@ -628,7 +628,7 @@ public class CollectionWarehousingRecordServiceImpl extends ServiceImpl<Collecti
                 cell.setCellValue(collectionWarehousingRecord1.getContractNo());
                 cell.setCellStyle(styleDetail);
                 HSSFDataFormat df = wb.createDataFormat(); // 此处设置数据格式
-                contextstyle.setDataFormat(df.getBuiltinFormat("#,##0.00"));//保留两位小数点
+                contextstyle.setDataFormat(HSSFDataFormat.getBuiltinFormat("#,##0.00"));//保留两位小数点
                 cell = rowx.createCell(4);
                 cell.setCellValue(collectionWarehousingRecord1.getCustomerName());
                 cell.setCellStyle(styleDetail);

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CommonUserServiceImpl.java

@@ -159,7 +159,7 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
     @Transactional(rollbackFor = Exception.class)
     public String register(CommonUser commonUser) throws ServiceException {
         //1.校验验证码
-        if (!commonUser.getVerifyCode().equals("123456")) {
+        if (!"123456".equals(commonUser.getVerifyCode())) {
             checkVerifyCode(commonUser.getPhone(), commonUser.getVerifyCode());
         }
         //2.校验用户是否存在
@@ -250,7 +250,7 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
     @Transactional(rollbackFor = Exception.class)
     public String resetPassword(CommonUser commonUser) throws ServiceException {
         //1.校验验证码
-        if (!commonUser.getVerifyCode().equals("123456")) {
+        if (!"123456".equals(commonUser.getVerifyCode())) {
             checkVerifyCode(commonUser.getPhone(), commonUser.getVerifyCode());
         }
         //2.校验用户是否存在
@@ -376,7 +376,7 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
     @Transactional(rollbackFor = Exception.class)
     public CommonUser loginVerifyCode(CommonUser commonUser) throws ServiceException {
         java.util.Date now = new java.util.Date();
-        if (!commonUser.getVerifyCode().equals("123456")) {
+        if (!"123456".equals(commonUser.getVerifyCode())) {
             //1.校验验证码
             checkVerifyCode(commonUser.getPhone(), commonUser.getVerifyCode());
         }
@@ -477,7 +477,7 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
     @Override
     @Transactional(rollbackFor = Exception.class)
     public CommonUser checkVerifyCode(CommonUser commonUser) throws ServiceException {
-        if (!commonUser.getVerifyCode().equals("123456")) {
+        if (!"123456".equals(commonUser.getVerifyCode())) {
             //1.校验验证码
             checkVerifyCode(commonUser.getPhone(), commonUser.getVerifyCode());
         }
@@ -699,10 +699,10 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
                 }
             }
             stmt.close();
-            return -1l;
+            return -1L;
         } catch (Exception e) {
             e.printStackTrace();
-            return -1l;
+            return -1L;
         }
     }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/FreightReceivingDispatchingServiceImpl.java

@@ -205,7 +205,7 @@ public class FreightReceivingDispatchingServiceImpl extends ServiceImpl<FreightR
         // 付款金额 用已付这个字段  然后累加
         freightReceivingDispatchingCar1.setGoodsEdPayable(freightReceivingDispatchingCar1.getGoodsEdPayable() + freightReceivingDispatchingCar.getGoodsEdPayable());
         freightReceivingDispatchingCar1.setGoodsDeductionAmount(freightReceivingDispatchingCar1.getGoodsDeductionAmount() + freightReceivingDispatchingCar.getGoodsDeductionAmount());
-        if (freightReceivingDispatchingCar1.getGoodsIngPayable() == freightReceivingDispatchingCar1.getGoodsEdPayable()) {
+        if (freightReceivingDispatchingCar1.getGoodsIngPayable().equals(freightReceivingDispatchingCar1.getGoodsEdPayable())) {
             freightReceivingDispatchingCar1.setStatusFlag("5");
             freightReceivingDispatchingCar1.setStatus("已完成");
         }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/IdentityAuthenticationInfoServiceImpl.java

@@ -55,6 +55,7 @@ public class IdentityAuthenticationInfoServiceImpl extends ServiceImpl<IdentityA
      * @param identityAuthenticationInfo
      * @return
      */
+    @Override
     public Page<IdentityAuthenticationInfo> selectIdentityAuthenticationInfo(IdentityAuthenticationInfo identityAuthenticationInfo) {
         Wrapper<IdentityAuthenticationInfo> identityAuthenticationInfoWrapper = new EntityWrapper<IdentityAuthenticationInfo>();
         //切换身份页面

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/NewNoticeTaskServiceImpl.java

@@ -68,6 +68,7 @@ public class NewNoticeTaskServiceImpl extends ServiceImpl<NoticeTaskMapper, Noti
     public NewNoticeTaskServiceImpl() {
     }
 
+    @Override
     public Page<NoticeTaskInfo> findPageNoticeTasks(NoticeTaskInfo noticeTask) {
         if (null == noticeTask.getPageSize()) {
             noticeTask.setPageSize(10);
@@ -96,7 +97,7 @@ public class NewNoticeTaskServiceImpl extends ServiceImpl<NoticeTaskMapper, Noti
         roleIdParam = roleIdParam.substring(0,roleIdParam.length() -1 );
         staffId = "'" + staffId + "'";
         Map<String, Object> pageView = new HashMap<>();
-        if(roleIdParam == null || roleIdParam.equals("")){
+        if(roleIdParam == null || "".equals(roleIdParam)){
             roleIdParam = "''";
         }
         pageView.put("roleId", roleIdParam);
@@ -165,6 +166,7 @@ public class NewNoticeTaskServiceImpl extends ServiceImpl<NoticeTaskMapper, Noti
         return noticeTaskInfoPage;
     }
 
+    @Override
     public void createNoticeTask(List<String> acceptIds, String vesselId, NoticeTaskInfo noticeTask) {
         if (null == noticeTask.getAcceptType()) {
             throw new NoticeException(NoticeErrorCodeEnums.NOTICE_ACCEPT_TYPE_NULL_ERROR);
@@ -198,6 +200,7 @@ public class NewNoticeTaskServiceImpl extends ServiceImpl<NoticeTaskMapper, Noti
         }
     }
 
+    @Override
     public Integer findNumber() {
         NoticeTaskInfo noticeTaskInfo = new NoticeTaskInfo();
         noticeTaskInfo.setNoticeTaskStatus(NoticeTaskStatus.TO_BE_PROCESSED);
@@ -209,12 +212,14 @@ public class NewNoticeTaskServiceImpl extends ServiceImpl<NoticeTaskMapper, Noti
         return noticeTaskInfoList.size();
     }
 
+    @Override
     public List<NoticeTaskInfo> findOverdueTaskByCurrentUser() {
         Wrapper<NoticeTaskInfo> noticeTaskWrapper = this.getCurrentUserNoticeTaskWrapper((NoticeTaskInfo)null);
         noticeTaskWrapper.isNotNull("overdue_date").lt("overdue_date", new Date());
         return this.selectList(noticeTaskWrapper);
     }
 
+    @Override
     public List<NoticeTaskInfo> findOverdueTask() {
         Wrapper<NoticeTaskInfo> noticeTaskWrapper = new EntityWrapper();
         noticeTaskWrapper.lt("overdue_date", new Date());
@@ -222,6 +227,7 @@ public class NewNoticeTaskServiceImpl extends ServiceImpl<NoticeTaskMapper, Noti
         return this.selectList(noticeTaskWrapper);
     }
 
+    @Override
     public List<NoticeBusinessTypeNumber> findBusinessTypeCount() {
         NoticeTaskInfo noticeTaskInfo = new NoticeTaskInfo();
         noticeTaskInfo.setNoticeTaskStatus(NoticeTaskStatus.TO_BE_PROCESSED);
@@ -245,6 +251,7 @@ public class NewNoticeTaskServiceImpl extends ServiceImpl<NoticeTaskMapper, Noti
         return noticeBusinessTypeNumbers;
     }
 
+    @Override
     public void handleNoticeTaskInfo(String staffId, String businessCode, String businessKey, String vesselId) {
         List<String> roleIds = null;
         if (StringUtils.isEmpty(vesselId)) {
@@ -267,10 +274,12 @@ public class NewNoticeTaskServiceImpl extends ServiceImpl<NoticeTaskMapper, Noti
         this.update(noticeTaskInfo, wrapper);
     }
 
+    @Override
     public List<NoticeTaskInfo> findNoticeTaskByBusiness(String businessCode, String businessId, NoticeTaskStatus noticeTaskStatus) {
         return this.selectList((new EntityWrapper()).eq("business_code", businessCode).eq("business_id", businessId).eq("notice_task_status", NoticeTaskStatus.TO_BE_PROCESSED));
     }
 
+    @Override
     public void removeReturnTask(String businessCode, String businessKey) {
         this.delete((new EntityWrapper()).eq("business_code", businessCode).eq("business_id", businessKey).eq("notice_task_status", NoticeTaskStatus.RETURN));
     }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/NewNoticeUtilServiceImpl.java

@@ -36,6 +36,7 @@ public class NewNoticeUtilServiceImpl implements INewNoticeUtilService {
     public NewNoticeUtilServiceImpl() {
     }
 
+    @Override
     public Wrapper<?> getCurrentUserNoticeTaskWrapper(Wrapper<?> wrapper, Class c) {
         String staffId = AuthSecurityUtils.getCurrentUserId();
         List<CommonStaffVessel> staffVessels = this.staffVesselService.findStaffVessel(AuthSecurityUtils.getCurrentUserId());
@@ -58,6 +59,7 @@ public class NewNoticeUtilServiceImpl implements INewNoticeUtilService {
         return wrapper;
     }
 
+    @Override
     public Wrapper<?> getFilterVesselWrapper(List<String> vesselIds) {
         Wrapper<?> wrapper = new EntityWrapper();
         if (CollectionUtils.isEmpty(vesselIds)) {
@@ -70,6 +72,7 @@ public class NewNoticeUtilServiceImpl implements INewNoticeUtilService {
         return wrapper;
     }
 
+    @Override
     public Wrapper<?> getFilterVesselWrapper(String vesselId) {
         Wrapper<?> wrapper = new EntityWrapper();
         if (StringUtils.isEmpty(vesselId)) {

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PaymentManagementServiceImpl.java

@@ -259,7 +259,7 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
                 .eq("goods_name", qualityInspectionManagement.getGoodsName())
                 .eq("status_flag", "3"));
         if (purchasePrice != null) {
-            if (purchasePrice.getParamType().equals("1")) {
+            if ("1".equals(purchasePrice.getParamType())) {
                 PurchasePriceDetail purchasePriceDetail = purchasePriceDetailService.selectOne(new EntityWrapper<PurchasePriceDetail>()
                         .eq("main_id", purchasePrice.getId())
                         .like("level", qualityInspectionManagement.getGrade().replace("品", ""))
@@ -1578,9 +1578,9 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
                 cell.setCellValue(editString(paymentManagement1.getQualityInspectionManagement().getGrade()));
                 cell.setCellStyle(styleDetail);
                 HSSFDataFormat df = wb.createDataFormat(); // 此处设置数据格式
-                contextstyle.setDataFormat(df.getBuiltinFormat("#,##0.00"));//保留两位小数点
+                contextstyle.setDataFormat(HSSFDataFormat.getBuiltinFormat("#,##0.00"));//保留两位小数点
                 HSSFDataFormat df1 = wb.createDataFormat(); // 此处设置数据格式
-                contextstyle1.setDataFormat(df1.getBuiltinFormat("#,##0.00"));//保留两位小数点
+                contextstyle1.setDataFormat(HSSFDataFormat.getBuiltinFormat("#,##0.00"));//保留两位小数点
                 cell = rowx.createCell(15);
                 if(!StringUtils.isEmpty(paymentManagement1.getQualityInspectionManagement().getWaterContent())){
                     cell.setCellValue(Double.parseDouble(paymentManagement1.getQualityInspectionManagement().getWaterContent()));
@@ -2336,9 +2336,9 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
                 cell.setCellValue(editString(paymentManagement1.getGrade()));
                 cell.setCellStyle(styleDetail);
                 HSSFDataFormat df = wb.createDataFormat(); // 此处设置数据格式
-                contextstyle.setDataFormat(df.getBuiltinFormat("#,##0.00"));//保留两位小数点
+                contextstyle.setDataFormat(HSSFDataFormat.getBuiltinFormat("#,##0.00"));//保留两位小数点
                 HSSFDataFormat df1 = wb.createDataFormat(); // 此处设置数据格式
-                contextstyle1.setDataFormat(df1.getBuiltinFormat("#,##0.00"));//保留两位小数点
+                contextstyle1.setDataFormat(HSSFDataFormat.getBuiltinFormat("#,##0.00"));//保留两位小数点
                 cell = rowx.createCell(15);
                 if(!StringUtils.isEmpty(paymentManagement1.getWaterContent())){
                     cell.setCellValue(Double.parseDouble(paymentManagement1.getWaterContent()));

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/SearchRecordsInfoServiceImpl.java

@@ -111,6 +111,7 @@ public class SearchRecordsInfoServiceImpl extends ServiceImpl<SearchRecordsInfoM
      * @param searchRecordsInfo
      * @return
      */
+    @Override
     public Page<SearchRecordsInfo> selectRecommendedSearchRecordsInfo(SearchRecordsInfo searchRecordsInfo) {
         Page<SearchRecordsInfo> recommendedSearchRecordsInfoPage = this.selectPage(searchRecordsInfo.getQueryPage(), new EntityWrapper<SearchRecordsInfo>()
                 .eq(SearchRecordsInfo.QueryFiles.COMMON_ID, searchRecordsInfo.getCommonId())

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/StockPurchaseReceiptReportServiceImpl.java

@@ -589,7 +589,7 @@ public class StockPurchaseReceiptReportServiceImpl extends ServiceImpl<StockPurc
                 cell.setCellValue(date);
                 cell.setCellStyle(styleDetail);
                 HSSFDataFormat df = wb.createDataFormat(); // 此处设置数据格式
-                contextstyle.setDataFormat(df.getBuiltinFormat("#,##0.00"));//保留两位小数点
+                contextstyle.setDataFormat(HSSFDataFormat.getBuiltinFormat("#,##0.00"));//保留两位小数点
                 cell = rowx.createCell(4);
                 cell.setCellValue(editDouble(stockPurchaseReceiptReport1.getGrossWeight()));
                 cell.setCellStyle(contextstyle);

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/StorageFeeRecordServiceImpl.java

@@ -653,7 +653,7 @@ public class StorageFeeRecordServiceImpl extends ServiceImpl<StorageFeeRecordMap
                 cell.setCellValue(editFloat(storageFeeRecord1.getStorageVolume()));
                 cell.setCellStyle(contextstyle);
                 HSSFDataFormat df = wb.createDataFormat(); // 此处设置数据格式
-                contextstyle.setDataFormat(df.getBuiltinFormat("#,##0.00"));//保留两位小数点
+                contextstyle.setDataFormat(HSSFDataFormat.getBuiltinFormat("#,##0.00"));//保留两位小数点
                 cell = rowx.createCell(4);
                 cell.setCellValue(editFloat(storageFeeRecord1.getDeliveryVolume()));
                 cell.setCellStyle(contextstyle);

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/TranProcessInfoServiceImpl.java

@@ -781,6 +781,7 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
      * @param id
      * @return
      */
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public String editFeedbackStatus(String id) {
         //查询反馈信息

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseBaseInfoServiceImpl.java

@@ -182,7 +182,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         }
         List<String> resourceIdList = this.getResourceIdList();
         if (!resourceIdList.contains("warehouseInfo-Look")) {
-            if (!personCharge.equals("13333333333")) {
+            if (!"13333333333".equals(personCharge)) {
                 warehouseBaseInfoWrapper.andNew().eq("person_phone", personCharge).or()
                         .like("other_person_charge", personCharge);
 
@@ -580,7 +580,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             }
         }
         this.updateById(warehouseBaseInfo);
-        if (warehouseBaseInfo.getWarehouseType().equals("1")) {
+        if ("1".equals(warehouseBaseInfo.getWarehouseType())) {
             List<WarehousePositionInfo> warehousePositionInfoList = warehouseBaseInfo.getWarehousePositionInfoList();
             if (!CollectionUtils.isEmpty(warehousePositionInfoList)) {
                 warehousePositionInfoList.forEach(warehousePositionInfo -> {
@@ -776,7 +776,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         //查询仓库信息
         WarehouseBaseInfo warehouseBaseInfo = this.selectById(id);
         this.deleteById(warehouseBaseInfo.getId());
-        if (warehouseBaseInfo.getWarehouseType().equals("1")) {
+        if ("1".equals(warehouseBaseInfo.getWarehouseType())) {
             //查询仓位信息
             List<WarehousePositionInfo> warehousePositionInfos = warehousePositionInfoService.selectList(new EntityWrapper<WarehousePositionInfo>()
                     .eq("base_id", warehouseBaseInfo.getId()).orderBy("bin_number", false));
@@ -1579,7 +1579,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 list.add(commonRoleService.selectById(commonStaffRole.getRoleId()));
             }
             for (CommonRole commonRole : list) {
-                if (commonRole.getRoleName().equals("内勤") || commonRole.getRoleName().equals("决策人") || commonRole.getRoleName().equals("财务") || commonRole.getRoleName().equals("出纳") || commonRole.getRoleName().equals("系统管理员") || commonRole.getRoleName().contains("总")) {
+                if ("内勤".equals(commonRole.getRoleName()) || "决策人".equals(commonRole.getRoleName()) || "财务".equals(commonRole.getRoleName()) || "出纳".equals(commonRole.getRoleName()) || commonRole.getRoleName().equals("系统管理员") || commonRole.getRoleName().contains("总")) {
                     List<WarehouseBaseInfo> warehouseBaseInfoList1 = this.selectList(new EntityWrapper<WarehouseBaseInfo>()
                             .eq("comp_id", compId)
                             .eq("delete_flag", "0"));
@@ -2371,9 +2371,9 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         HSSFRow rowp = sheet.createRow((int) (rownum));
         rowp.setHeightInPoints(20);
         HSSFDataFormat df1 = wb.createDataFormat(); // 此处设置数据格式
-        contextstyle1.setDataFormat(df1.getBuiltinFormat("#,##0.00"));//保留两位小数点
+        contextstyle1.setDataFormat(HSSFDataFormat.getBuiltinFormat("#,##0.00"));//保留两位小数点
         HSSFDataFormat df2 = wb.createDataFormat(); // 此处设置数据格式
-        contextstyle2.setDataFormat(df2.getBuiltinFormat("#,###0.000"));//保留三位小数点
+        contextstyle2.setDataFormat(HSSFDataFormat.getBuiltinFormat("#,###0.000"));//保留三位小数点
         cell = rowp.createCell(1);
         cell.setCellValue("平均值/合计");
         cell.setCellStyle(styleDetail);
@@ -2718,9 +2718,9 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 cell.setCellStyle(contextstyle);
                 cell = rowx.createCell(26);
                 HSSFDataFormat df = wb.createDataFormat(); // 此处设置数据格式
-                contextstyle.setDataFormat(df.getBuiltinFormat("#,##0.00"));//保留两位小数点
+                contextstyle.setDataFormat(HSSFDataFormat.getBuiltinFormat("#,##0.00"));//保留两位小数点
                 HSSFDataFormat df3 = wb.createDataFormat(); // 此处设置数据格式
-                contextstyle2.setDataFormat(df3.getBuiltinFormat("#,###0.000"));//保留两位小数点
+                contextstyle2.setDataFormat(HSSFDataFormat.getBuiltinFormat("#,###0.000"));//保留两位小数点
                 if (exportVView.getGrossWeight() != null) {
                     cell.setCellValue(editDouble(exportVView.getGrossWeight()));
                 }
@@ -3237,7 +3237,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             HSSFRow rowp = sheet.createRow((int) (rownum));
             rowp.setHeightInPoints(20);
             HSSFDataFormat df1 = wb.createDataFormat(); // 此处设置数据格式
-            contextstyle1.setDataFormat(df1.getBuiltinFormat("#,##0.00"));//保留两位小数点
+            contextstyle1.setDataFormat(HSSFDataFormat.getBuiltinFormat("#,##0.00"));//保留两位小数点
             cell = rowp.createCell(1);
             cell.setCellValue("平均值/合计");
             cell.setCellStyle(styleDetail);
@@ -3575,9 +3575,9 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 cell.setCellStyle(contextstyle);
                 cell = rowx.createCell(26);
                 HSSFDataFormat df = wb.createDataFormat(); // 此处设置数据格式
-                contextstyle.setDataFormat(df.getBuiltinFormat("#,##0.00"));//保留两位小数点
+                contextstyle.setDataFormat(HSSFDataFormat.getBuiltinFormat("#,##0.00"));//保留两位小数点
                 HSSFDataFormat df1 = wb.createDataFormat(); // 此处设置数据格式
-                contextstyle1.setDataFormat(df1.getBuiltinFormat("#,##0.00"));//保留两位小数点
+                contextstyle1.setDataFormat(HSSFDataFormat.getBuiltinFormat("#,##0.00"));//保留两位小数点
                 cell.setCellValue(editDouble(exportVView.getGrossWeight()));
                 cell.setCellStyle(contextstyle);
                 cell = rowx.createCell(27);
@@ -4102,7 +4102,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             HSSFRow rowp = sheet.createRow((int) (rownum));
             rowp.setHeightInPoints(20);
             HSSFDataFormat df1 = wb.createDataFormat(); // 此处设置数据格式
-            contextstyle1.setDataFormat(df1.getBuiltinFormat("#,##0.00"));//保留两位小数点
+            contextstyle1.setDataFormat(HSSFDataFormat.getBuiltinFormat("#,##0.00"));//保留两位小数点
             cell = rowp.createCell(1);
             cell.setCellValue("平均值/合计");
             cell.setCellStyle(styleDetail);
@@ -4481,9 +4481,9 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 cell.setCellValue("1");
                 cell.setCellStyle(styleDetail);
                 HSSFDataFormat df = wb.createDataFormat(); // 此处设置数据格式
-                contextstyle.setDataFormat(df.getBuiltinFormat("#,##0.00"));//保留两位小数点
+                contextstyle.setDataFormat(HSSFDataFormat.getBuiltinFormat("#,##0.00"));//保留两位小数点
                 HSSFDataFormat df1 = wb.createDataFormat(); // 此处设置数据格式
-                contextstyle1.setDataFormat(df1.getBuiltinFormat("#,##0.00"));//保留两位小数点
+                contextstyle1.setDataFormat(HSSFDataFormat.getBuiltinFormat("#,##0.00"));//保留两位小数点
                 cell = rowx.createCell(32);
                 cell.setCellValue(editDouble(exportVView.getGrossWeight()));
                 cell.setCellStyle(contextstyle);
@@ -5000,7 +5000,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             HSSFRow rowp = sheet.createRow((int) (rownum));
             rowp.setHeightInPoints(20);
             HSSFDataFormat df1 = wb.createDataFormat(); // 此处设置数据格式
-            contextstyle1.setDataFormat(df1.getBuiltinFormat("#,##0.00"));//保留两位小数点
+            contextstyle1.setDataFormat(HSSFDataFormat.getBuiltinFormat("#,##0.00"));//保留两位小数点
             cell = rowp.createCell(1);
             cell.setCellValue("平均值/合计");
             cell.setCellStyle(styleDetail);
@@ -5360,9 +5360,9 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 cell.setCellValue("1");
                 cell.setCellStyle(styleDetail);
                 HSSFDataFormat df = wb.createDataFormat(); // 此处设置数据格式
-                contextstyle.setDataFormat(df.getBuiltinFormat("#,##0.00"));//保留两位小数点
+                contextstyle.setDataFormat(HSSFDataFormat.getBuiltinFormat("#,##0.00"));//保留两位小数点
                 HSSFDataFormat df1 = wb.createDataFormat(); // 此处设置数据格式
-                contextstyle1.setDataFormat(df1.getBuiltinFormat("#,##0.00"));//保留两位小数点
+                contextstyle1.setDataFormat(HSSFDataFormat.getBuiltinFormat("#,##0.00"));//保留两位小数点
                 cell = rowx.createCell(30);
                 cell.setCellValue(editDouble(exportVView.getGrossWeight()));
                 cell.setCellStyle(contextstyle);
@@ -5621,6 +5621,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
      * @param warehouseBaseInfo
      * @return
      */
+    @Override
     public Page<WarehouseBaseInfo> selectBaseInfo(WarehouseBaseInfo warehouseBaseInfo) {
 
         Map<String, Object> pageView = new HashMap<>();

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseInOutInfoServiceImpl.java

@@ -2416,7 +2416,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         if(qualityInspectionManagement != null){
                             warehouseInOutInfo.setInOutTaskNo(qualityInspectionManagement.getInOutTaskNo());
                         }
-                        if(weighingManagement.getManagementType().equals("3")){
+                        if("3".equals(weighingManagement.getManagementType())){
                             warehouseInOutInfo.setInOutFlag("1");
                         }else{
                             warehouseInOutInfo.setInOutFlag("2");

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WeighingManagementServiceImpl.java

@@ -390,13 +390,13 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         if(weighingManagement != null){
             WarehouseInOutInfo warehouseInOutInfo = warehouseInOutInfoService.selectById(weighingManagement.getWarehouseInOutId());
             if(warehouseInOutInfo != null && warehouseInOutInfo.getInOutFlag()!=null){
-                if(warehouseInOutInfo.getInOutFlag().equals("1")){
-                    if (weighingManagement.getStatusFlag().equals("3")){
+                if("1".equals(warehouseInOutInfo.getInOutFlag())){
+                    if ("3".equals(weighingManagement.getStatusFlag())){
                         throw new YException(YExceptionEnum.OUT_WEIGHT_STATUS_ERROR);
                     }
                 }
                 else{
-                    if (weighingManagement.getStatusFlag().equals("5")){
+                    if ("5".equals(weighingManagement.getStatusFlag())){
                         throw new YException(YExceptionEnum.IN_WEIGHT_STATUS_ERROR);
                     }
                 }
@@ -415,7 +415,7 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                 this.deleteById(weighingManagement.getId());
                 qualityInspectionManagementService.deleteById(qualityInspectionManagement.getId());
                 if(warehouseInOutInfo != null){
-                    if (warehouseInOutInfo.getStatusFlag().equals("3")){
+                    if ("3".equals(warehouseInOutInfo.getStatusFlag())){
                         throw new YException(YExceptionEnum.IN_OUT_STATUS_ERROR);
                     }
                     warehouseInOutInfoService.deleteById(weighingManagement.getWarehouseInOutId());

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/util/EntityAnalyse.java

@@ -42,7 +42,7 @@ public class EntityAnalyse {
             String body = EntityUtils.toString(response.getEntity());
             System.out.println(body);
             JSONObject jsonObject = JSONObject.parseObject(body);
-            if(jsonObject.getString("ret").equals("200")){
+            if("200".equals(jsonObject.getString("ret"))){
                 JSONObject data = JSONObject.parseObject(jsonObject.getString("data"));
                 DistinguishView distinguishView = new DistinguishView();
                 distinguishView.setBankNo(data.getString("number"));
@@ -61,7 +61,7 @@ public class EntityAnalyse {
                     body = EntityUtils.toString(response.getEntity());
                     System.out.println(body);
                     jsonObject = JSONObject.parseObject(body);
-                    if(jsonObject.getString("code").equals("0")){
+                    if("0".equals(jsonObject.getString("code"))){
                         data = JSONObject.parseObject(jsonObject.getString("data"));
                         JSONObject detail = JSONObject.parseObject(data.getString("detail"));
                         distinguishView.setBankName(detail.getString("bankName"));
@@ -93,7 +93,7 @@ public class EntityAnalyse {
                             jsonObject = JSONObject.parseObject(body);
                             JSONObject jsonData = jsonObject.getJSONObject("data");
                             JSONObject res = jsonObject.getJSONObject("resp");
-                            if(res.get("RespCode").equals("200")){
+                            if("200".equals(res.get("RespCode"))){
                                 JSONArray jsonArray = jsonData.getJSONArray("record");
                                 List<String> bankList = new ArrayList<>();
                                 for(int i=0;i<jsonArray.size();i++) {

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/util/GeneratorUtil.java

@@ -27,14 +27,16 @@ public class GeneratorUtil {
 
     public static String genOrderId(String head) {
         int i = orderIdCount.incrementAndGet() % 100;
-        if (i < 100)
+        if (i < 100){
             i += 100;
+        }
         return head + ORDER_ID_FORMAT.format(new Date()) + i;
     }
     public static String genContractNo(String head) {
         int i = tranContractCount.incrementAndGet() % 100;
-        if (i < 100)
+        if (i < 100){
             i += 100;
+        }
         return head + ORDER_ID_FORMAT.format(new Date()) + i;
     }
     public static String genFileName(){

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/util/HttpUtil.java

@@ -29,7 +29,7 @@ public class HttpUtil {
         URL url = new URL(generalUrl);
         // 打开和URL之间的连接
         HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-    	System.out.println("打开链接，开始发送请求"+new Date().getTime()/1000);
+    	System.out.println("打开链接，开始发送请求"+System.currentTimeMillis()/1000);
         connection.setRequestMethod("POST");
         // 设置通用的请求属性
         connection.setRequestProperty("Content-Type", "application/json");
@@ -55,16 +55,20 @@ public class HttpUtil {
         // 定义 BufferedReader输入流来读取URL的响应
         BufferedReader in = null;
         if (requestUrl.contains("nlp"))
+        {
             in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "GBK"));
+        }
         else
+        {
             in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8"));
+        }
         String result = "";
         String getLine;
         while ((getLine = in.readLine()) != null) {
             result += getLine;
         }
         in.close();
-        System.out.println("请求结束"+new Date().getTime()/1000);
+        System.out.println("请求结束"+System.currentTimeMillis()/1000);
         System.out.println("result:" + result);
         return result;
     }
@@ -74,7 +78,7 @@ public class HttpUtil {
         URL url = new URL(generalUrl);
         // 打开和URL之间的连接
         HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-    	System.out.println("打开链接，开始发送请求"+new Date().getTime()/1000);
+    	System.out.println("打开链接，开始发送请求"+System.currentTimeMillis()/1000);
         connection.setRequestMethod("POST");
         // 设置通用的请求属性
         connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
@@ -100,16 +104,20 @@ public class HttpUtil {
         // 定义 BufferedReader输入流来读取URL的响应
         BufferedReader in = null;
         if (requestUrl.contains("nlp"))
+        {
             in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "GBK"));
+        }
         else
+        {
             in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8"));
+        }
         String result = "";
         String getLine;
         while ((getLine = in.readLine()) != null) {
             result += getLine;
         }
         in.close();
-        System.out.println("请求结束"+new Date().getTime()/1000);
+        System.out.println("请求结束"+System.currentTimeMillis()/1000);
         System.out.println("result:" + result);
         return result;
     }
@@ -129,13 +137,13 @@ public class HttpUtil {
 		} catch (SecurityException e) {
 			e.printStackTrace();
 		}
-    	String filePath = path+"VOICE"+new Date().getTime()/1000+".mp3";
+    	String filePath = path+"VOICE"+System.currentTimeMillis()/1000+".mp3";
         String generalUrl = requestUrl;
         URL url = new URL(generalUrl);
         System.out.println(generalUrl);
         // 打开和URL之间的连接
         HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-    	System.out.println("打开链接，开始发送请求"+new Date().getTime()/1000);
+    	System.out.println("打开链接，开始发送请求"+System.currentTimeMillis()/1000);
         connection.setRequestMethod("POST");
         // 设置通用的请求属性
         connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
@@ -167,7 +175,7 @@ public class HttpUtil {
         	outputStream.write(buffer,0,len);
 		}
         outputStream.close();
-        System.out.println("请求结束"+new Date().getTime()/1000);
+        System.out.println("请求结束"+System.currentTimeMillis()/1000);
         System.out.println("MP3文件保存目录:" + filePath);
         return filePath;
     }
@@ -185,7 +193,7 @@ public class HttpUtil {
         URL url = new URL(generalUrl);
         // 打开和URL之间的连接
         HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-    	System.out.println("打开链接，开始发送请求"+new Date().getTime()/1000);
+    	System.out.println("打开链接，开始发送请求"+System.currentTimeMillis()/1000);
         connection.setRequestMethod("POST");
         // 设置通用的请求属性
         connection.setRequestProperty("Content-Type", "application/json");
@@ -209,16 +217,20 @@ public class HttpUtil {
         // 定义 BufferedReader输入流来读取URL的响应
         BufferedReader in = null;
         if (requestUrl.contains("nlp"))
+        {
             in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "GBK"));
+        }
         else
+        {
             in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8"));
+        }
         String result = "";
         String getLine;
         while ((getLine = in.readLine()) != null) {
             result += getLine;
         }
         in.close();
-        System.out.println("请求结束"+new Date().getTime()/1000);
+        System.out.println("请求结束"+System.currentTimeMillis()/1000);
         System.out.println("result:" + result);
         return result;
     }
@@ -232,12 +244,12 @@ public class HttpUtil {
 		} catch (SecurityException e) {
 			e.printStackTrace();
 		}
-    	String filePath = path+"VOICE"+new Date().getTime()/1000+".apk";
+    	String filePath = path+"VOICE"+System.currentTimeMillis()/1000+".apk";
         String generalUrl = requestUrl;
         URL url = new URL(generalUrl);
         // 打开和URL之间的连接
         HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-    	System.out.println("打开链接，开始发送请求"+new Date().getTime()/1000);
+    	System.out.println("打开链接，开始发送请求"+System.currentTimeMillis()/1000);
         connection.setRequestMethod("GET");
         // 设置通用的请求属性
         connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
@@ -270,7 +282,7 @@ public class HttpUtil {
         	outputStream.write(buffer,0,len);
 		}
         outputStream.close();
-        System.out.println("请求结束"+new Date().getTime()/1000);
+        System.out.println("请求结束"+System.currentTimeMillis()/1000);
         System.out.println("MP3文件保存目录:" + filePath);
         return filePath;
     }
@@ -302,9 +314,13 @@ public class HttpUtil {
         // 定义 BufferedReader输入流来读取URL的响应
         BufferedReader in = null;
         if (requestUrl.contains("nlp"))
+        {
             in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8"));
+        }
         else
+        {
             in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8"));
+        }
         String result = "";
         String getLine;
         while ((getLine = in.readLine()) != null) {
@@ -355,9 +371,13 @@ public class HttpUtil {
         // 定义 BufferedReader输入流来读取URL的响应
         BufferedReader in = null;
         if (requestUrl.contains("nlp_wordseg")||requestUrl.contains("nlp_wordpos")||requestUrl.contains("nlp_wordner")||requestUrl.contains("nlp_wordsyn"))
+        {
             in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "GBK"));
+        }
         else
+        {
             in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8"));
+        }
         String result = "";
         String getLine;
         while ((getLine = in.readLine()) != null) {

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/util/HttpUtils.java

@@ -286,12 +286,15 @@ public class HttpUtils {
         try {
             SSLContext ctx = SSLContext.getInstance("TLS");
             X509TrustManager tm = new X509TrustManager() {
+                @Override
                 public X509Certificate[] getAcceptedIssuers() {
                     return null;
                 }
+                @Override
                 public void checkClientTrusted(X509Certificate[] xcs, String str) {
 
                 }
+                @Override
                 public void checkServerTrusted(X509Certificate[] xcs, String str) {
 
                 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/util/XmlUtil.java

@@ -145,7 +145,7 @@ public class XmlUtil implements InitializingBean {
         Float weight = paymentManagement.getNetWeight();
         Double as = paymentManagement.getAmountIngPayable()/weight * 100;
         String goodsName = paymentManagement.getGoodsName();
-        if(paymentManagement.getGoodsName().equals("玉米（潮粮）")){
+        if("玉米（潮粮）".equals(paymentManagement.getGoodsName())){
 //            paymentManagement.setGoodsName("玉米");
             goodsName = "玉米";
             weight = paymentManagement.getPureWeight();
@@ -260,7 +260,7 @@ public class XmlUtil implements InitializingBean {
         Float weight = paymentManagement.getNetWeight();
         Double as = paymentManagement.getAmountIngPayable()/weight * 100;
         String goodsName = paymentManagement.getGoodsName();
-        if(paymentManagement.getGoodsName().equals("玉米（潮粮）")){
+        if("玉米（潮粮）".equals(paymentManagement.getGoodsName())){
 //            paymentManagement.setGoodsName("玉米");
             goodsName = "玉米";
             weight = paymentManagement.getPureWeight();
@@ -374,7 +374,7 @@ public class XmlUtil implements InitializingBean {
         Float weight = paymentManagement.getPureWeight();
         Double as = paymentManagement.getAmountIngPayable()/weight * 100;
         String goodsName = paymentManagement.getGoodsName();
-        if(paymentManagement.getGoodsName().equals("玉米（潮粮）")){
+        if("玉米（潮粮）".equals(paymentManagement.getGoodsName())){
 //            paymentManagement.setGoodsName("玉米");
             goodsName = "玉米";
             weight = paymentManagement.getPureWeight();