【新增】数据清洗

db/sqlserver.sql

@@ -510,3 +510,10 @@ ALTER TABLE [dbo].[QRTZ_TRIGGERS] ADD
   )
 GO
 
+
+
+ALTER TABLE picture
+ALTER COLUMN Pic_file varchar(200);
+
+ALTER TABLE product
+ALTER COLUMN graph varchar(200);
\ No newline at end of file

src/main/java/io/office/modules/manage/controller/CasesController.java

@@ -105,4 +105,15 @@ public class CasesController {
         return R.ok();
     }
 
+    /**
+     * 信息
+     */
+    @RequestMapping("api/getDetailInfo")
+    //  @RequiresPermissions("manage:partners:info")
+    public R getDetailInfo(@RequestBody Map<String, String> params){
+        CasesEntity casesEntity = casesService.getById(params.get("id"));
+
+        return R.ok().put("data", casesEntity);
+    }
+
 }

src/main/java/io/office/modules/manage/controller/DocController.java

@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.office.modules.app.annotation.Login;
 import io.office.modules.manage.entity.DocEntity;
@@ -100,7 +101,6 @@ public class DocController extends AbstractController {
         return R.ok();
     }
 
-
     @Login
     @PostMapping("/api/downLoad")
     // @RequiresPermissions("generator:indexcarouselmanage:pictureImageList")
@@ -120,5 +120,24 @@ public class DocController extends AbstractController {
     }
 
 
+    @Login
+    @PostMapping("/api/list")
+    // @RequiresPermissions("generator:indexcarouselmanage:pictureImageList")
+    public R listPage(@RequestBody Map<String, Object> params) {
+        try {
+            QueryWrapper<DocEntity> docEntityQueryWrapper = new QueryWrapper<>();
+            docEntityQueryWrapper.eq("category","1");
+            docEntityQueryWrapper.eq("status","1");
+            docEntityQueryWrapper.orderByDesc("id");
+
+            IPage<NewsEntity> pageData = docService.page(new Page(Integer.parseInt(params.get("page").toString()),Integer.parseInt(params.get("size").toString()) ), docEntityQueryWrapper);
+
+            return R.ok().put("data", new PageUtils(pageData));
+        } catch (Exception e) {
+            log.error("get4PartyTopNews error: {}", e);
+            return R.error(e.getMessage());
+        }
+    }
+
 
 }

src/main/java/io/office/modules/manage/controller/DomainListController.java

@@ -33,9 +33,9 @@ public class DomainListController {
 
     @RequestMapping("/api/list")
     // @RequiresPermissions("manage:doc:list")
-    public R list(@RequestParam Map<String, Object> params) {
+    public R list() {
 
-        return R.ok().put("data", domainListProperties.getList());
+        return R.ok().put("data", domainListProperties.getDomain());
     }
 
 

src/main/java/io/office/modules/manage/controller/EanUpcController.java

@@ -121,13 +121,15 @@ public class EanUpcController {
 
     /**
      * 详情
-     * @param eanUpcEntity
+     * @param
      * @return
      */
     @Login
     @RequestMapping("/api/getDetailById")
-    public R getDetailById(@RequestBody EanUpcEntity eanUpcEntity) {
-
+    public R getDetailById(@RequestBody Map<String, String> params) {
+        EanUpcEntity eanUpcEntity = new EanUpcEntity();
+        eanUpcEntity.setFId(params.get("fId"));
+        eanUpcEntity.setCode(params.get("code"));
         return R.ok().put("data",eanUpcService.getDetailById(eanUpcEntity));
     }
 

src/main/java/io/office/modules/manage/controller/PartnersController.java

@@ -130,4 +130,15 @@ public class PartnersController extends AbstractController {
     }
 
 
+    /**
+     * 信息
+     */
+    @RequestMapping("api/getDetailInfo")
+    //  @RequiresPermissions("manage:partners:info")
+    public R getDetailInfo(@RequestBody Map<String, String> params){
+        PartnersEntity partners = partnersService.getById(params.get("id"));
+
+        return R.ok().put("data", partners);
+    }
+
 }

src/main/java/io/office/modules/manage/controller/PlanBranchController.java

@@ -97,7 +97,8 @@ public class PlanBranchController {
 
         QueryWrapper<PlanBranchEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("classnum",planBranch.getClassnum());
-        queryWrapper.orderByDesc("id");
+        queryWrapper.orderByAsc("id");
+
         return R.ok().put("data",planBranchService.list(queryWrapper));
     }
 

src/main/java/io/office/modules/manage/entity/DomainListProperties.java

@@ -3,7 +3,7 @@ package io.office.modules.manage.entity;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
-import java.util.List;
+
 
 /**
  *
@@ -13,7 +13,7 @@ import java.util.List;
  * @date 10:40 2021/12/28
  */
 @Data
-@ConfigurationProperties(prefix = "gs1.domain") //指定ly.upload开头的变量
+@ConfigurationProperties(prefix = "gs1") //指定ly.upload开头的变量
 public class DomainListProperties {
-    private List<String> list;
+    private String domain;
 }

src/main/java/io/office/modules/manage/entity/EanUpcEntity.java

@@ -22,8 +22,7 @@ public class EanUpcEntity implements Serializable {
 	/**
 	 * $column.comments
 	 */
-	@TableId
-	private Integer fId;
+	private String fId;
 	/**
 	 * $column.comments
 	 */

src/main/java/io/office/modules/manage/service/impl/CasesServiceImpl.java

@@ -43,6 +43,7 @@ public class CasesServiceImpl extends ServiceImpl<CasesDao, CasesEntity> impleme
         QueryWrapper<CasesEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("status", "1");
         queryWrapper.gt("levels", "0");
+        queryWrapper.orderByDesc("id","levels","showtime","updatedate");
         if (params.get("title") != null && StringUtils.isNotBlank(params.get("title").toString())) {
             queryWrapper.like("title", params.get("title").toString());
         }

src/main/java/io/office/modules/manage/service/impl/PartnersServiceImpl.java

@@ -86,7 +86,7 @@ public class PartnersServiceImpl extends ServiceImpl<PartnersDao, PartnersEntity
         QueryWrapper<PartnersEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("status", "1");
         queryWrapper.gt("levels", "0");
-
+        queryWrapper.orderByDesc("id","levels","updatedate");
         if (params.get("firmname") != null && StringUtils.isNotBlank(params.get("firmname").toString())) {
             queryWrapper.like("firmname", params.get("firmname").toString());
         }

src/main/java/io/office/modules/manage/transfer/DirectoryMap.java

+package io.office.modules.manage.transfer;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ *
+ * 
 @description:
+ *
+ * @author wudi
+ * @date 16:48 2021/12/30
+ */
+@Data
+@Component
+@EnableConfigurationProperties
+@ConfigurationProperties(prefix = "directory")
+public class DirectoryMap {
+
+    private Map<String,String> replaceMap;
+}

src/main/resources/application-dev.yml

@@ -89,9 +89,15 @@ searchDayCountLimitSwitch: 10
 
 #域名
 gs1:
-    domain:
-        list:
-            - http://81.68.189.225
-            - http://81.68.189.225
-
+    domain: http://81.68.189.225:8080
 
+#map注入
+directory:
+    replaceMap:
+        "news/article.aspx": News/msg
+        "News/article.aspx": News/msg
+        "news/article_admin.aspx": News/msg
+        "News/VideoDetails.aspx": News/msgVideo
+        "/Org/Intro.aspx": /Org/Intro
+        "News/PicNews.aspx": News/msg
+        "service/notice/article.aspx": News/NoticeArticle

src/main/resources/application-test.yml

@@ -87,8 +87,19 @@ searchDayLimitSwitch: 0
 searchDayCountLimitSwitch: 10
 
 #域名
+#域名
 gs1:
-    domain:
-        list:
-            - http://192.168.0.77
-            - http://192.168.0.77
\ No newline at end of file
+    domain: http://192.168.0.77:80
+
+
+directory:
+    replaceMap:
+        news/article.aspx: News/msg
+        News/article.aspx: News/msg
+        news/article_admin.aspx: News/msg
+        News/VideoDetails.aspx: News/msgVideo
+        /Org/Intro.aspx: /Org/Intro
+        News/PicNews.aspx: News/msg
+        service/notice/article.aspx: News/NoticeArticle
+
+

src/main/resources/application.yml

@@ -14,7 +14,7 @@ spring:
     name: GS1OfficeWebSit
   # 环境 dev|test|prod
   profiles:
-    active: dev
+    active: test
   # jackson时间格式化
   jackson:
     time-zone: GMT+8
@@ -70,3 +70,7 @@ logging:
     org:
       mybatis: debug
     dao: debug
+
+
+
+

src/main/resources/mapper/manage/EanUpcDao.xml

@@ -87,8 +87,8 @@
         LEFT JOIN ean_upc b ON a.f_id = b.f_id
         LEFT JOIN center_outer.dbo.bulletin c ON c.code = b.code
         WHERE
-            a.f_id = '6'
-        AND b.code = '6901009'
+            a.f_id = #{eanUpcEntity.fId}
+        AND b.code = #{eanUpcEntity.code}
         ORDER BY
             c.Id DESC
     </select>