平曲线相关

blade-service/blade-business/src/main/java/org/springblade/business/controller/MileageController.java

@@ -92,7 +92,7 @@ public class MileageController {
          }
         //同步更新片段信息
         if(!old.getPrefix().equals(part.getPrefix())){
-            this.partService.updatePart(old.getProjectId(),old.getPrefix(),part.getPrefix());
+            this.partService.updatePart(old.getProjectId(),old.getId(),part.getPrefix());
         }
         old.setName(part.getName());
         old.setPrefix(part.getPrefix());
@@ -106,10 +106,15 @@ public class MileageController {
         if(StringUtil.isBlank(ids)){
             return R.fail("对象不存在");
         }
-        if(this.service.count(Wrappers.<Mileagexy>lambdaQuery().in(Mileagexy::getPartId,Func.toLongList(ids)))>0){
-             return  R.fail("已经存关联线元信息，无法删除");
+//        if(this.service.count(Wrappers.<Mileagexy>lambdaQuery().in(Mileagexy::getPartId,Func.toLongList(ids)))>0){
+//             return  R.fail("已经存关联线元信息，无法删除");
+//        }
+        List<Long> idsLong=Func.toLongList(ids);
+        if(Func.isNotEmpty(idsLong)){
+            this.service.update(Wrappers.<Mileagexy>lambdaUpdate().set(Mileagexy::getIsDeleted,1).in(Mileagexy::getPartId,idsLong));
+            return R.status(partService.removeByIds(idsLong));
         }
-        return R.status(partService.removeByIds(Func.toLongList(ids)));
+        return R.fail("无效id");
     }
 
 

blade-service/blade-business/src/main/java/org/springblade/business/feignClient/MileageClientImpl.java

@@ -10,6 +10,7 @@ import org.springblade.business.utils.MileageUtill;
 import org.springblade.common.utils.BaseUtils;
 import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringPool;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.*;
@@ -30,15 +31,15 @@ public class MileageClientImpl implements MileageClient {
     @Override
     public Map<String,String[]> mileage2Coordinate(List<String> mileages,Long contractId) {
         Map<String,String[]> result = new HashMap<>(mileages.size());
-        Map<String,List<String>> group=mileages.stream().collect(Collectors.groupingBy(e->e.replaceAll("K.+","")));
+        Map<String,List<String>> group=mileages.stream().collect(Collectors.groupingBy(e->e.replaceAll("K.+",StringPool.EMPTY)));
         for(Map.Entry<String,List<String>>  entry:group.entrySet()){
             String  part=  entry.getKey();
             List<Mileagexy> target=this.service.list(Wrappers.<Mileagexy>lambdaQuery().eq(Mileagexy::getContractId,contractId.toString()).eq(Mileagexy::getPartNo,part).orderByAsc(Mileagexy::getValue));
             if(CollectionUtil.isNotEmpty(target)){
                 entry.getValue().forEach(e->{
-                    String[] r = new String[]{"",""};
+                    String[] r = new String[]{StringPool.EMPTY,StringPool.EMPTY};
                     if(Func.isNotBlank(e)){
-                        String[] arr=e.split("@");
+                        String[] arr=e.split(StringPool.AT);
                         double[] db= MileageUtill.azimuthZbXy(BaseUtils.k2d(arr[0]),Double.parseDouble(arr[1]),90,target);
                         if(db!=null&&db.length==3){
                             r[0]=String.valueOf(db[0]);

blade-service/blade-business/src/main/java/org/springblade/business/mapper/MileagePartMapper.xml

@@ -21,11 +21,6 @@
         <result column="sort" property="sort"/>
     </resultMap>
 
-    <update id="updateByProjectIdAndPrefix">
-         update t_om_mileagexy set partno =#{newpartno}
-          where    project_id = #{projectId}
-          AND prefix = #{partNo}
-    </update>
 
 
 </mapper>

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/MileagePartService.java

@@ -2,12 +2,14 @@ package org.springblade.business.service.impl;
 
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
 import org.springblade.business.entity.MileagePart;
 import org.springblade.business.mapper.MileagePartMapper;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.core.tool.utils.StringUtil;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 import java.util.HashMap;
 import java.util.List;
@@ -17,12 +19,13 @@ import java.util.Map;
  * @author yangyj
  */
 @Service
+@RequiredArgsConstructor
 public class MileagePartService extends BaseServiceImpl<MileagePartMapper, MileagePart>{
 
+    private final JdbcTemplate jdbcTemplate;
 
-
-    public void updatePart(String projectId ,String partNo ,String newPartNo){
-        baseMapper.updateByProjectIdAndPrefix(projectId,partNo,newPartNo);
+    public void updatePart(String projectId ,Long partId ,String newPartNo){
+      this.jdbcTemplate.update("update t_om_mileagexy set part_no ='"+newPartNo+"'  where  is_deleted=0 and  project_id ='"+projectId+"' AND part_id ="+partId);
     }
 
 

blade-service/blade-manager/src/main/java/com/mixsmart/utils/CustomFunction.java

@@ -2025,7 +2025,9 @@ public class CustomFunction {
 		return "";
 	}
 
-
+	public static void main(String[] args) {
+		System.out.println(count("10、11、10、11、9"));
+	}
 
 	public static  Object abs(Object o){
 		/**

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/FormulaController.java

@@ -237,8 +237,8 @@ public class FormulaController {
             }
             if(Func.isBlank(info.getFail())){
                 info.setFail(info.getSize().toString());
-            }else if(info.getFail().contains("%")){
-                String tmp = info.getFail().replace("%","");
+            }else if(info.getFail().contains(StringPool.PERCENT)){
+                String tmp = info.getFail().replace(StringPool.PERCENT,"");
                 info.setFail(String.valueOf((int)Math.round(Double.parseDouble(tmp)*(double)info.getSize()/100)));
             }
             Map<String,String> keymap = this.tabService.getTablbCols(info.getPkId().toString(),null);