修改计划逻辑；上传计划文件获取url中的文件名；

src/main/java/com/wangxiaolu/promotion/controller/activityplanv2/PromPlanCoreController.java

@@ -42,15 +42,11 @@ public class PromPlanCoreController {
         }
 
         try {
-            String[] urlArr = activityPlanVo.getExcelUrl().split("weda-uploader/");
+            String[] urlArr = activityPlanVo.getExcelUrl().split("/");
             String fileId = urlArr[urlArr.length - 1];
-            if (fileId.length() > 53) {
-                throw new DataException(RCode.ACTIVITY_PLAN_FILENAME_LONG);
-            }
-
-            String filePath = "/home/" + fileId;
+            String filePath = "/root/promotion/planv2/" + fileId;
+//todo            String filePath = "/Users/a02200059/Desktop/2.0/" + fileId;
             FileUtils.downloadExcel(activityPlanVo.getExcelUrl(), filePath);
-// todo           String filePath = "/Users/a02200059/Desktop/测试新增v3 2.xlsx";
             activityPlanVo.setExcelId(fileId);
             Map<String, Object> map = promPlanCoreService.selfPlanUp(activityPlanVo, filePath);
             return R.success(map);
@@ -63,9 +59,31 @@ public class PromPlanCoreController {
 
 
     /**
-     * todo 城市经理修改
+     * 城市经理修改
      */
+    @PutMapping("/self/put")
+    public R selfPlanPut(@RequestBody ActivityPlanVo activityPlanVo) {
+        // 判断当前账号是否是城市经理
+        boolean isSelf = manageEmployeeQueryService.isOneSelf(activityPlanVo.getEmployeeId());
+        if (!isSelf) {
+            throw new DataException(RCode.EMP_PRIVILEGE_ERROR);
+        }
 
+        try {
+            String[] urlArr = activityPlanVo.getExcelUrl().split("/");
+            String fileId = urlArr[urlArr.length - 1];
+            String filePath = "/root/promotion/planv2/" + fileId;
+//todo            String filePath = "/Users/a02200059/Desktop/2.0/" + fileId;
+            FileUtils.downloadExcel(activityPlanVo.getExcelUrl(), filePath);
+            activityPlanVo.setExcelId(fileId);
+            Map<String, Object> map = promPlanCoreService.selfPlanPut(activityPlanVo, filePath);
+            return R.success(map);
+        } catch (DataException e) {
+            return new R(e.getCode(), e.getMsg(), null);
+        } catch (Exception e) {
+            return R.fail();
+        }
+    }
 
 
 

src/main/java/com/wangxiaolu/promotion/enums/plan/PlanStatus.java

+package com.wangxiaolu.promotion.enums.plan;
+
+/**
+ * @author : liqiulin
+ * @date : 2025-02-12 17
+ * @describe :
+ */
+public enum PlanStatus {
+    /**
+     * 是否执行：1:执行；0：未执行；
+     */
+    EXECUTION(1, "执行"),
+    NOT_EXECUTION(0, "未执行");
+
+    private final Integer code;
+    private final String desc;
+
+    PlanStatus(Integer code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+}

src/main/java/com/wangxiaolu/promotion/service/activityplanv2/PromPlanCoreService.java

@@ -18,5 +18,7 @@ public interface PromPlanCoreService {
 
     void deletePlan(List<Long> planIds);
 
-    Map<String, Object> authPlanUp(ActivityPlanVo activityPlanVo, String filePath);
+    Map<String, Object> authPlanUp(ActivityPlanVo activityPlanVo, String filePath) throws DataException;
+
+    Map<String, Object> selfPlanPut(ActivityPlanVo activityPlanVo, String filePath) throws DataException;
 }

src/main/java/com/wangxiaolu/promotion/utils/AliyunUtils.java

@@ -3,19 +3,18 @@ package com.wangxiaolu.promotion.utils;
 
 import com.alibaba.fastjson.JSONObject;
 import com.aliyun.oss.common.utils.BinaryUtil;
-import com.aliyun.sts20150401.models.AssumeRoleResponseBody;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.commons.codec.binary.Base64;
+import com.aliyun.sts20150401.Client;
 import com.aliyuncs.DefaultAcsClient;
 import com.aliyuncs.IAcsClient;
 import com.aliyuncs.auth.sts.AssumeRoleRequest;
 import com.aliyuncs.auth.sts.AssumeRoleResponse;
 import com.aliyuncs.exceptions.ClientException;
 import com.aliyuncs.profile.DefaultProfile;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.codec.binary.Base64;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
-import com.aliyun.sts20150401.Client;
 
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;

src/main/resources/mapper/activityplanv2/ActivityPlanInfoMapper.xml

@@ -34,6 +34,16 @@
     </resultMap>
 
 
+    <resultMap id="SimResultMap" type="com.wangxiaolu.promotion.domain.activityplanv2.mapper.entity.ActivityPlanInfoDo">
+        <id property="id" column="id" jdbcType="BIGINT"/>
+        <result property="employeeName" column="employee_name" jdbcType="VARCHAR"/>
+        <result property="employeeNo" column="employee_no" jdbcType="VARCHAR"/>
+        <result property="province" column="province" jdbcType="VARCHAR"/>
+        <result property="planStatus" column="plan_status" jdbcType="INTEGER"/>
+        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+        <result property="modifyTime" column="modify_time" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
     <resultMap id="PlanBase" type="com.wangxiaolu.promotion.domain.activityplanv2.mapper.entity.ActivityPlanInfoDo">
         <id property="id" column="id" jdbcType="BIGINT"/>
         <result property="employeeName" column="employee_name" jdbcType="VARCHAR"/>
@@ -66,8 +76,8 @@
         </foreach>
     </insert>
 
-    <select id="selectPlan" resultMap="BaseResultMap">
-        select employee_name, create_time
+    <select id="selectPlan" resultMap="SimResultMap">
+        select id,employee_name,employee_no,province,plan_status,create_time,modify_time
         from activity_plan_info
         where date = #{date} and store_code = #{storeCode} and is_delete = 1;
     </select>