【修改】bug修改

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

+package io.office.modules.manage.controller;
+
+
+import io.office.common.utils.R;
+
+import io.office.modules.manage.entity.dto.FaqDTO;
+
+import lombok.extern.slf4j.Slf4j;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.client.RestTemplate;
+
+@RestController
+@RequestMapping("/faq")
+@Slf4j
+public class FaqController {
+
+       @RequestMapping("/api/getFaqListByTypeName")
+    public String list(@RequestBody FaqDTO faqDTO){
+
+        String url = "http://member.gds.org.cn:8080/chinatm/tm/faq/third/getFaqListByTypeName?pager.pageNo="+faqDTO.getPage()+"&pager.pageSize="+faqDTO.getLimit();
+
+        if(StringUtils.isNotBlank(faqDTO.getTypeName())) {
+            url = url+"&typeName="+faqDTO.getTypeName();
+        }
+
+        if(StringUtils.isNotBlank(faqDTO.getCxnr())) {
+            url = url+"&cxnr="+faqDTO.getCxnr();
+        }
+
+        RestTemplate restTemplate = new RestTemplate();
+        //创建请求头
+        //创建请求头
+        ResponseEntity<String> responseEntity = restTemplate.getForEntity(url, String.class);
+        if (responseEntity.getStatusCode().value() == 200) {
+            log.info(responseEntity.getBody());
+
+            return responseEntity.getBody();
+        }
+
+
+        return null;
+    }
+
+
+
+    @RequestMapping("/api/getById")
+    public String getById(@RequestBody FaqDTO faqDTO){
+
+        String url = "http://member.gds.org.cn:8080/chinatm/tm/faq/third/getFaqById?id=";
+
+        if(StringUtils.isNotBlank(faqDTO.getId())) {
+            url = url+faqDTO.getId();
+        }
+
+        RestTemplate restTemplate = new RestTemplate();
+        //创建请求头
+        //创建请求头
+        ResponseEntity<String> responseEntity = restTemplate.getForEntity(url, String.class);
+        if (responseEntity.getStatusCode().value() == 200) {
+            log.info(responseEntity.getBody());
+
+            return responseEntity.getBody();
+        }
+
+
+        return null;
+    }
+
+
+}

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

@@ -173,7 +173,7 @@ public class IndexCarouselManageController  extends AbstractController {
             QueryWrapper<IndexCarouselManageEntity> newsEntityQueryWrapper = new QueryWrapper<>();
             newsEntityQueryWrapper.eq("classnum","大轮播");
             newsEntityQueryWrapper.eq("checkflag_index","1");
-            newsEntityQueryWrapper.gt("levels","0");
+            newsEntityQueryWrapper.gt("levels",0);
             newsEntityQueryWrapper.orderByDesc("levels_index");
             List<IndexCarouselManageEntity> list = indexCarouselManageService.list(newsEntityQueryWrapper);
             return R.ok().put("data", list);
@@ -192,7 +192,7 @@ public class IndexCarouselManageController  extends AbstractController {
             QueryWrapper<IndexCarouselManageEntity> newsEntityQueryWrapper = new QueryWrapper<>();
             newsEntityQueryWrapper.eq("classnum","小轮播");
             newsEntityQueryWrapper.eq("checkflag_index","1");
-            newsEntityQueryWrapper.gt("levels","0");
+            newsEntityQueryWrapper.gt("levels",0);
             newsEntityQueryWrapper.orderByDesc("levels_index");
             List<IndexCarouselManageEntity> list = indexCarouselManageService.list(newsEntityQueryWrapper);
             return R.ok().put("data", list);

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

@@ -101,15 +101,7 @@ public class MedicalController extends AbstractController {
     @RequestMapping("/delete")
     @RequiresPermissions("manage:medical:delete")
     public R delete(@RequestBody List<String> ids) {
-        MedicalEntity medical = new MedicalEntity();
-        String username = getUser().getUsername();
-        medical.setEditor(username);
-        medical.setLasteditor(username);
-        medical.setUpdatetime(new Date());
-        medical.setLevel(0);
-        QueryWrapper<MedicalEntity> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("id", ids);
-        medicalService.update(medical, queryWrapper);
+        medicalService.removeByIds(ids);
         return R.ok("删除成功!");
     }
 
@@ -140,8 +132,8 @@ public class MedicalController extends AbstractController {
     public R getList10ByType(@RequestBody MedicalEntity medical) {
         QueryWrapper<MedicalEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.select("top 7 id,title ");
-        queryWrapper.gt("level", "0");
-        queryWrapper.eq("status", "1");
+        queryWrapper.gt("level", 0);
+        queryWrapper.eq("status", 1);
         queryWrapper.orderByDesc("level");
         if (StringUtils.isBlank(medical.getType())) {
             return R.error("请输入分类");
@@ -158,8 +150,8 @@ public class MedicalController extends AbstractController {
     public R getList3ByType() {
         QueryWrapper<MedicalEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.select("top 3 id,title ");
-        queryWrapper.gt("level", "0");
-
+        queryWrapper.gt("level", 0);
+        queryWrapper.gt("status", 1);
         queryWrapper.orderByDesc("releaseTime");
         return R.ok().put("data", medicalService.list(queryWrapper));
     }

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

@@ -575,8 +575,8 @@ public class NewsController extends AbstractController {
 
         QueryWrapper<NewsEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.select("top 7 * ");
-        queryWrapper.gt("levels","0");
-        queryWrapper.eq("status","1");
+        queryWrapper.gt("levels",0);
+        queryWrapper.eq("status",1);
         //.or().like("content","零售").or().like("content","商品二维码").or().like("content","全渠道")
         queryWrapper.eq("classid","14").or().like("keyword","零售").or().like("keyword","全渠道").like("keyword","商品二维码");
         queryWrapper.orderByDesc("levels ","id");
@@ -593,8 +593,8 @@ public class NewsController extends AbstractController {
     public R retailList(@RequestBody Map<String, String> params) {
 
         QueryWrapper<NewsEntity> queryWrapper = new QueryWrapper<>();
-        queryWrapper.gt("levels","0");
-        queryWrapper.eq("status","1");
+        queryWrapper.gt("levels",0);
+        queryWrapper.eq("status",1);
         //or().like("content","零售").or().like("content","商品二维码").or().like("content","全渠道").
         queryWrapper.eq("classid","14").or().like("keyword","零售").or().like("keyword","全渠道").like("keyword","商品二维码");
         queryWrapper.orderByDesc("levels ","id");
@@ -612,8 +612,8 @@ public class NewsController extends AbstractController {
     public R retailCodeTop6List(@RequestBody Map<String, String> params) {
 
         QueryWrapper<NewsEntity> queryWrapper = new QueryWrapper<>();
-        queryWrapper.gt("levels","0");
-        queryWrapper.eq("status","1");
+        queryWrapper.gt("levels",0);
+        queryWrapper.eq("status",1);
         //or().like("content","零售").or().like("content","商品二维码").or().like("content","全渠道").
         queryWrapper.eq("classid","14").or().like("keyword","商品二维码");
         queryWrapper.orderByDesc("levels ","id");

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

@@ -136,8 +136,8 @@ public class PictureController extends AbstractController {
 
             QueryWrapper<PictureEntity> newsEntityQueryWrapper = new QueryWrapper<>();
             newsEntityQueryWrapper.select("TOP 3 *");
-            newsEntityQueryWrapper.eq("status","1");
-            newsEntityQueryWrapper.gt("PicLevel","0");
+            newsEntityQueryWrapper.eq("status",1);
+            newsEntityQueryWrapper.gt("PicLevel",0);
             newsEntityQueryWrapper.orderByDesc("PicLevel");
             newsEntityQueryWrapper.orderByDesc("showtime");
             newsEntityQueryWrapper.orderByDesc("inputDate");

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

@@ -137,8 +137,8 @@ public class PolicyController extends AbstractController {
             QueryWrapper<PolicyEntity> policyEntityQueryWrapper = new QueryWrapper<>();
             policyEntityQueryWrapper.select("top 4 *");
             policyEntityQueryWrapper.eq("class", "法律法规");
-            policyEntityQueryWrapper.gt("levels", "0");
-            policyEntityQueryWrapper.gt("status ", "0");
+            policyEntityQueryWrapper.gt("levels", 0);
+            policyEntityQueryWrapper.gt("status ", 0);
             policyEntityQueryWrapper.orderByDesc("levels");
             policyEntityQueryWrapper.orderByDesc("releasedate");
             return R.ok().put("data", policyService.list(policyEntityQueryWrapper));

src/main/java/io/office/modules/manage/dao/NewsDao.java

@@ -33,6 +33,8 @@ public interface NewsDao extends BaseMapper<NewsEntity> {
 
     List<NewsEntity> selectRealTimeInfo(@Param("newsParams")NewsParams newsParams, Page page);
 
+    List<Integer> getT0P9(@Param("classid") int classid);
+
     List<NewsEntity> getHdbdList(@Param("newsParams")NewsParams newsParams, Page page);
 
     String selectClassName(Integer classid);

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

@@ -15,7 +15,7 @@ import lombok.Data;
  * @date 2021-12-05 14:35:52
  */
 @Data
-@TableName("center_sync.dbo.branch")
+@TableName("center_outer.dbo.branch")
 public class BranchEntity implements Serializable {
 	private static final long serialVersionUID = 1L;
 

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

@@ -15,7 +15,7 @@ import lombok.Data;
  * @date 2021-12-06 16:04:53
  */
 @Data
-@TableName("center_sync.dbo.EAN_UPC")
+@TableName("center_outer.dbo.EAN_UPC")
 public class EanUpcEntity implements Serializable {
 	private static final long serialVersionUID = 1L;
 

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

@@ -59,6 +59,6 @@ public class PlanBranchEntity implements Serializable {
 	/**
 	 * $column.comments
 	 */
-	public Integer checkflag;
+	public String checkflag;
 
 }

src/main/java/io/office/modules/manage/entity/dto/FaqDTO.java

+package io.office.modules.manage.entity.dto;
+
+import io.office.modules.manage.entity.page.PageParams;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+@Data
+public class FaqDTO  extends PageParams implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    private String typeName;
+
+    private String cxnr;
+
+    private String id;
+
+
+}

src/main/java/io/office/modules/manage/entity/dto/NewsParams.java

@@ -45,4 +45,6 @@ public class NewsParams extends PageParams {
     private String categoryId;
 
     private String clanguage;
+
+    private List<Integer> ids;
 }

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

@@ -35,7 +35,7 @@ public class CasesServiceImpl extends ServiceImpl<CasesDao, CasesEntity> impleme
     public PageUtils queryPage(Map<String, Object> params) {
         IPage<CasesEntity> page = this.page(
                 new Query<CasesEntity>().getPage(params),
-                new QueryWrapper<CasesEntity>()
+                new QueryWrapper<CasesEntity>().like(params.get("service") != null && StringUtils.isNotBlank(params.get("service").toString()),"service",params.get("service").toString())
         );
 
         return new PageUtils(page);
@@ -48,8 +48,8 @@ public class CasesServiceImpl extends ServiceImpl<CasesDao, CasesEntity> impleme
         Page page = new Page(Integer.valueOf(params.get("page").toString()),
                 Integer.valueOf(params.get("size").toString()));
         QueryWrapper<CasesEntity> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("status", "1");
-        queryWrapper.gt("levels", "0");
+        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/NewsMovieServiceImpl.java

@@ -38,7 +38,7 @@ public class NewsMovieServiceImpl extends ServiceImpl<NewsMovieDao, NewsMovieEnt
         if(params.containsKey("levels")) {
             newsMovieEntityQueryWrapper.eq("levels",params.get("levels"));
         } else{
-            newsMovieEntityQueryWrapper.gt("levels","0");
+            newsMovieEntityQueryWrapper.gt("levels",0);
         }
         newsMovieEntityQueryWrapper.likeLeft(params.containsKey("title") && StringUtils.isNotBlank(String.valueOf(params.get("title"))),"title",params.get("title"));
         newsMovieEntityQueryWrapper.likeLeft(params.containsKey("author")&& StringUtils.isNotBlank(String.valueOf(params.get("author"))),"author",params.get("author"));

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

@@ -8,6 +8,7 @@ import io.office.modules.manage.entity.*;
 import io.office.modules.manage.entity.dto.NewsParams;
 import io.office.modules.manage.vo.response.SearchVo;
 import io.office.modules.sys.entity.SysUserEntity;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,6 +27,7 @@ import io.office.modules.manage.dao.NewsDao;
 import io.office.modules.manage.service.NewsService;
 
 
+@Slf4j
 @Service("newsService")
 public class NewsServiceImpl extends ServiceImpl<NewsDao, NewsEntity> implements NewsService {
 
@@ -115,6 +117,7 @@ public class NewsServiceImpl extends ServiceImpl<NewsDao, NewsEntity> implements
 
     @Override
     public Page<NewsEntity> selectNewsList(NewsParams newsParams, Page page) {
+        log.info("查询参数 ：{}",newsParams);
         List<NewsEntity> newsList = this.newsDao.selectNewsList(newsParams, page);
         page.setRecords(newsList);
         return page;

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

@@ -85,8 +85,8 @@ public class PartnersServiceImpl extends ServiceImpl<PartnersDao, PartnersEntity
         Page page = new Page(Integer.valueOf(params.get("page").toString()),
                 Integer.valueOf(params.get("size").toString()));
         QueryWrapper<PartnersEntity> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("status", "1");
-        queryWrapper.gt("levels", "0");
+        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/service/impl/RetailServiceImpl.java

@@ -31,9 +31,9 @@ public class RetailServiceImpl extends ServiceImpl<RetailDao, RetailEntity> impl
     public PageUtils queryPageList(Map<String, Object> params) {
 
         QueryWrapper<RetailEntity> retailEntityQueryWrapper = new QueryWrapper<>();
-        retailEntityQueryWrapper.eq("classid","1");
-        retailEntityQueryWrapper.gt("levels","0");
-        retailEntityQueryWrapper.eq("status","1");
+        retailEntityQueryWrapper.eq("classid",1);
+        retailEntityQueryWrapper.gt("levels",0);
+        retailEntityQueryWrapper.eq("status",1);
         retailEntityQueryWrapper.orderByAsc("levels");
         retailEntityQueryWrapper.orderByAsc("id");
                 IPage <RetailEntity> page = this.page(

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

@@ -14,6 +14,9 @@ import io.office.modules.manage.service.TopicnewsService;
 import io.office.modules.manage.vo.request.TopicNewsPartyRequestVo;
 import io.office.modules.manage.vo.response.TopicNewsPartyVo;
 import io.office.modules.sys.entity.SysUserEntity;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.ListUtils;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -113,6 +116,15 @@ public class TopicnewsServiceImpl extends ServiceImpl<TopicnewsDao, TopicnewsEnt
 
     @Override
     public Page<NewsEntity> getHdbdList(NewsParams newsParams, Page page) {
+
+        if(page.getSize()==4) {
+            //就去获取要排除的数据
+            List<Integer> t0P9List = newsDao.getT0P9(newsParams.getClassId());
+            if(CollectionUtils.isNotEmpty(t0P9List)) {
+                newsParams.setIds(t0P9List);
+            }
+        }
+
         List<NewsEntity> list = this.newsDao.getHdbdList(newsParams,page);
         page.setRecords(list);
         return page;

src/main/java/io/office/modules/sys/controller/SysRoleController.java

@@ -44,9 +44,9 @@ public class SysRoleController extends AbstractController {
 	@RequiresPermissions("sys:role:list")
 	public R list(@RequestParam Map<String, Object> params){
 		//如果不是超级管理员，则只查询自己创建的角色列表
-		if(getUserId() != Constant.SUPER_ADMIN){
-			params.put("createUserId", getUserId());
-		}
+//		if(getUserId() != Constant.SUPER_ADMIN){
+//			params.put("createUserId", getUserId());
+//		}
 
 		PageUtils page = sysRoleService.queryPage(params);
 
@@ -62,9 +62,9 @@ public class SysRoleController extends AbstractController {
 		Map<String, Object> map = new HashMap<>();
 		
 		//如果不是超级管理员，则只查询自己所拥有的角色列表
-		if(getUserId() != Constant.SUPER_ADMIN){
-			map.put("create_user_id", getUserId());
-		}
+//		if(getUserId() != Constant.SUPER_ADMIN){
+//			map.put("create_user_id", getUserId());
+//		}
 		List<SysRoleEntity> list = (List<SysRoleEntity>) sysRoleService.listByMap(map);
 		
 		return R.ok().put("list", list);

src/main/java/io/office/modules/sys/controller/SysUserController.java

@@ -50,9 +50,9 @@ public class SysUserController extends AbstractController {
 	@RequiresPermissions("sys:user:list")
 	public R list(@RequestParam Map<String, Object> params){
 		//只有超级管理员，才能查看所有管理员列表
-		if(getUserId() != Constant.SUPER_ADMIN){
-			params.put("createUserId", getUserId());
-		}
+//		if(getUserId() != Constant.SUPER_ADMIN){
+//			params.put("createUserId", getUserId());
+//		}
 		PageUtils page = sysUserService.queryPage(params);
 
 		return R.ok().put("page", page);

src/main/java/io/office/modules/sys/service/impl/SysLogServiceImpl.java

@@ -31,7 +31,7 @@ public class SysLogServiceImpl extends ServiceImpl<SysLogDao, SysLogEntity> impl
 
         IPage<SysLogEntity> page = this.page(
             new Query<SysLogEntity>().getPage(params),
-            new QueryWrapper<SysLogEntity>().like(StringUtils.isNotBlank(key),"username", key)
+            new QueryWrapper<SysLogEntity>().like(StringUtils.isNotBlank(key),"username", key).orderByDesc("create_date")
         );
 
         return new PageUtils(page);

src/main/java/io/office/modules/sys/service/impl/SysMenuServiceImpl.java

@@ -60,9 +60,9 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuDao, SysMenuEntity> i
 	@Override
 	public List<SysMenuEntity> getUserMenuList(Long userId) {
 		//系统管理员，拥有最高权限
-		if(userId == Constant.SUPER_ADMIN){
-			return getAllMenuList(null);
-		}
+//		if(userId == Constant.SUPER_ADMIN){
+//			return getAllMenuList(null);
+//		}
 		
 		//用户菜单列表
 		List<Long> menuIdList = sysUserService.queryAllMenuId(userId);

src/main/java/io/office/modules/sys/service/impl/SysRoleServiceImpl.java

@@ -109,9 +109,9 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleDao, SysRoleEntity> i
 	 */
 	private void checkPrems(SysRoleEntity role){
 		//如果不是超级管理员，则需要判断角色的权限是否超过自己的权限
-		if(role.getCreateUserId() == Constant.SUPER_ADMIN){
-			return ;
-		}
+//		if(role.getCreateUserId() == Constant.SUPER_ADMIN){
+//			return ;
+//		}
 		
 		//查询用户所拥有的菜单列表
 		List<Long> menuIdList = sysUserService.queryAllMenuId(role.getCreateUserId());

src/main/java/io/office/modules/sys/service/impl/SysUserServiceImpl.java

@@ -130,9 +130,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
 			return;
 		}
 		//如果不是超级管理员，则需要判断用户的角色是否自己创建
-		if(user.getCreateUserId() == Constant.SUPER_ADMIN){
-			return ;
-		}
+//		if(user.getCreateUserId() == Constant.SUPER_ADMIN){
+//			return ;
+//		}
 		
 		//查询用户创建的角色列表
 		List<Long> roleIdList = sysRoleService.queryRoleIdList(user.getCreateUserId());

src/main/java/io/office/modules/ueditor/com/baidu/ueditor/ActionEnter.java

@@ -11,7 +11,9 @@ import io.office.modules.ueditor.com.baidu.ueditor.define.State;
 import io.office.modules.ueditor.com.baidu.ueditor.hunter.FileManager;
 import io.office.modules.ueditor.com.baidu.ueditor.hunter.ImageHunter;
 import io.office.modules.ueditor.com.baidu.ueditor.upload.Uploader;
+import lombok.extern.slf4j.Slf4j;
 
+@Slf4j
 public class ActionEnter {
 	
 	private HttpServletRequest request = null;
@@ -95,6 +97,8 @@ public class ActionEnter {
 				
 		}
 
+		log.info("富文本編輯器：{}  \n  {}",actionCode,state.toJSONString());
+
 		return state.toJSONString();
 		
 	}

src/main/java/io/office/modules/ueditor/com/baidu/ueditor/hunter/FileManager.java

@@ -10,10 +10,11 @@ import io.office.modules.ueditor.com.baidu.ueditor.define.AppInfo;
 import io.office.modules.ueditor.com.baidu.ueditor.define.BaseState;
 import io.office.modules.ueditor.com.baidu.ueditor.define.MultiState;
 import io.office.modules.ueditor.com.baidu.ueditor.define.State;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 
 
-
+@Slf4j
 public class FileManager {
 
 	private String dir = null;
@@ -81,13 +82,17 @@ public class FileManager {
 	}
 	
 	private String getPath ( File file ) {
-		
 		String path = file.getAbsolutePath();
-		
-		return path.replace( this.rootPath, "/" );
-		
+		path = path.replace("M:","http://dynamic.gs1cn.org/office");
+		return path;
 	}
 
+/*	public static void main(String[] args) {
+		String str = "M:\\uploadFileResource\\ueditor\\jsp\\upload\\image\\20230516\\1684218723631039297.jpg";
+		str = str.replaceAll("M\\:\\\\","http://dynamic.gs1cn.org/office/uploadFileResource\");
+		System.out.println(str);
+	}*/
+	
 	private String[] getAllowFiles ( Object fileExt ) {
 		
 		String[] exts = null;

src/main/resources/application-prod.yml

@@ -6,7 +6,7 @@ spring:
         host: 127.0.0.1
         port: 6379
         #password: J0UjwnsIVDr7pSeU # 密码（默认为空）
-        password:
+        password: J0UjwnsIVDr7pSeU
         timeout: 6000ms  # 连接超时时长（毫秒）
         jedis:
             pool:
@@ -18,9 +18,9 @@ spring:
         type: com.alibaba.druid.pool.DruidDataSource
         druid:
             driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-            url: jdbc:sqlserver://192.168.0.85:1433;DatabaseName=gs1cn_db
-            username: test
-            password: test123
+            url: jdbc:sqlserver://192.168.0.85:1433;DatabaseName=gs108
+            username: test2
+            password: test2
             initial-size: 10
             max-active: 100
             min-idle: 10
@@ -57,9 +57,9 @@ dynamic:
             password: ryr@3647we
         slave2:
             driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-            url: jdbc:sqlserver://192.168.0.85:1433;DatabaseName=gs1cn_db
-            username: test
-            password: test123
+            url: jdbc:sqlserver://192.168.0.85:1433;DatabaseName=gs108
+            username: test2
+            password: test2
 ##多数据源的配置
 #dynamic:
 #  datasource:
@@ -86,18 +86,18 @@ file:
     save:
         path: M:/uploadFileResource/
     request:
-        prefix: http://192.168.0.81:9091/office/uploadFileResource/
+        prefix: http://dynamic.gs1cn.org/office/uploadFileResource/
 
 ueditorSavePath: M:/uploadFileResource/
-prefix_host: http://192.168.0.81:9091/office/
+prefix_host: http://dynamic.gs1cn.org/office/
 
 #uploadFileQY: C:\upload_img\firm_archives_file\ #/第二步，电子表格上传路径(企业认证)
-uploadFileQY: M:/uploadFileResource/upload_img/firm_archives_file/ #/第二步，电子表格上传路径(企业认证)
+uploadFileQY: M:\uploadFileResource\upload_img\firm_archives_file\ #/第二步，电子表格上传路径(企业认证)
 #uploadFileQYOne: C:\upload_img\firmBusinessLicenseFile\ #第一步，营业执照上传路径(企业认证)
-uploadFileQYOne: M:/uploadFileResource/upload_img/firmBusinessLicenseFile/ #第一步，营业执照上传路径(企业认证)
+uploadFileQYOne: M:\uploadFileResource\upload_img\firmBusinessLicenseFile\ #第一步，营业执照上传路径(企业认证)
 
 #是否开启查询限制  1 打开  0关闭
-searchLimitSwitch: 0
+searchLimitSwitch: 1
 #是否开启每次查询次数限制  1 打开  0关闭
 searchDayLimitSwitch: 0
 #查询次数限制上限
@@ -105,4 +105,4 @@ searchDayCountLimitSwitch: 100
 
 #域名
 gs1:
-    domain: http://192.168.0.81:80
+    domain: http://www.gs1cn.org
\ No newline at end of file

src/main/resources/application-prod2.yml

@@ -52,7 +52,7 @@ dynamic:
     datasource:
         slave1:
             driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-            url: jdbc:sqlserver://192.168.0.85:1433;DatabaseName=center_sync
+            url: jdbc:sqlserver://192.168.0.85:1433;DatabaseName=center_outer
             username: test
             password: test123
         slave2:

src/main/resources/application.yml

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

src/main/resources/config.json

@@ -8,7 +8,7 @@
     "imageCompressEnable": true, /* 是否压缩图片,默认是true */
     "imageCompressBorder": 1600, /* 图片压缩最长边限制 */
     "imageInsertAlign": "none", /* 插入的图片浮动方式 */
-    "imageUrlPrefix": "localhost:9091/office/uploadFileResource/", /* 图片访问路径前缀 */
+    "imageUrlPrefix": "http://dynamic.gs1cn.org/office/uploadFileResource", /* 图片访问路径前缀 */
     "imagePathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
 
                                 /* {filename} 会替换成原文件名,配置这项需要注意中文乱码问题 */
@@ -29,13 +29,13 @@
     "scrawlFieldName": "upfile", /* 提交的图片表单名称 */
     "scrawlPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
     "scrawlMaxSize": 2048000, /* 上传大小限制，单位B */
-    "scrawlUrlPrefix": "", /* 图片访问路径前缀 */
+    "scrawlUrlPrefix": "http://dynamic.gs1cn.org/office/uploadFileResource", /* 图片访问路径前缀 */
     "scrawlInsertAlign": "none",
 
     /* 截图工具上传 */
     "snapscreenActionName": "uploadimage", /* 执行上传截图的action名称 */
     "snapscreenPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
-    "snapscreenUrlPrefix": "", /* 图片访问路径前缀 */
+    "snapscreenUrlPrefix": "http://dynamic.gs1cn.org/office/uploadFileResource", /* 图片访问路径前缀 */
     "snapscreenInsertAlign": "none", /* 插入的图片浮动方式 */
 
     /* 抓取远程图片配置 */
@@ -43,7 +43,7 @@
     "catcherActionName": "catchimage", /* 执行抓取远程图片的action名称 */
     "catcherFieldName": "source", /* 提交的图片列表表单名称 */
     "catcherPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
-    "catcherUrlPrefix": "", /* 图片访问路径前缀 */
+    "catcherUrlPrefix": "http://dynamic.gs1cn.org/office/uploadFileResource", /* 图片访问路径前缀 */
     "catcherMaxSize": 2048000, /* 上传大小限制，单位B */
     "catcherAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], /* 抓取图片格式显示 */
 
@@ -51,7 +51,7 @@
     "videoActionName": "uploadvideo", /* 执行上传视频的action名称 */
     "videoFieldName": "upfile", /* 提交的视频表单名称 */
     "videoPathFormat": "/ueditor/jsp/upload/video/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
-    "videoUrlPrefix": "", /* 视频访问路径前缀 */
+    "videoUrlPrefix": "http://dynamic.gs1cn.org/office/uploadFileResource", /* 视频访问路径前缀 */
     "videoMaxSize": 102400000, /* 上传大小限制，单位B，默认100MB */
     "videoAllowFiles": [
         ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg",
@@ -61,7 +61,7 @@
     "fileActionName": "uploadfile", /* controller里,执行上传视频的action名称 */
     "fileFieldName": "upfile", /* 提交的文件表单名称 */
     "filePathFormat": "/ueditor/jsp/upload/file/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
-    "fileUrlPrefix": "", /* 文件访问路径前缀 */
+    "fileUrlPrefix": "http://dynamic.gs1cn.org/office/uploadFileResource", /* 文件访问路径前缀 */
     "fileMaxSize": 51200000, /* 上传大小限制，单位B，默认50MB */
     "fileAllowFiles": [
         ".png", ".jpg", ".jpeg", ".gif", ".bmp",
@@ -75,14 +75,14 @@
     "imageManagerActionName": "listimage", /* 执行图片管理的action名称 */
     "imageManagerListPath": "/ueditor/jsp/upload/image/", /* 指定要列出图片的目录 */
     "imageManagerListSize": 20, /* 每次列出文件数量 */
-    "imageManagerUrlPrefix": "", /* 图片访问路径前缀 */
+    "imageManagerUrlPrefix": "http://dynamic.gs1cn.org/office/uploadFileResource", /* 图片访问路径前缀 */
     "imageManagerInsertAlign": "none", /* 插入的图片浮动方式 */
     "imageManagerAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], /* 列出的文件类型 */
 
     /* 列出指定目录下的文件 */
     "fileManagerActionName": "listfile", /* 执行文件管理的action名称 */
     "fileManagerListPath": "/ueditor/jsp/upload/file/", /* 指定要列出文件的目录 */
-    "fileManagerUrlPrefix": "", /* 文件访问路径前缀 */
+    "fileManagerUrlPrefix": "http://dynamic.gs1cn.org/office/uploadFileResource", /* 文件访问路径前缀 */
     "fileManagerListSize": 20, /* 每次列出文件数量 */
     "fileManagerAllowFiles": [
         ".png", ".jpg", ".jpeg", ".gif", ".bmp",

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

@@ -27,9 +27,9 @@
             b.address_description,
             c.personname
         FROM
-            center_sync.dbo.branch a
+            center_outer.dbo.branch a
         LEFT JOIN codeagent b ON ltrim(rtrim(a.branch_code))  = ltrim(rtrim(b.id))
-        LEFT JOIN center_sync.dbo.person c ON a.branch_contact = c.personid
+        LEFT JOIN center_outer.dbo.person c ON a.branch_contact = c.personid
         WHERE
             ltrim(rtrim(branch_code)) = ltrim(rtrim(#{branchCode}))
     </select>
@@ -40,7 +40,7 @@
         b.mail,
         b.website
         FROM
-        center_sync.dbo.branch a
+        center_outer.dbo.branch a
         LEFT JOIN codeagent b ON ltrim(rtrim(a.branch_code)) = ltrim(rtrim(b.id))
         WHERE
         ltrim(rtrim(a.branch_code)) &lt;&gt; '0000'

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

@@ -25,8 +25,8 @@
         a.log_date,
         b.login_date
         FROM
-        center_sync.dbo.bulletin AS a
-        INNER JOIN center_sync.dbo.ean_upc AS b ON a.code = b.code
+        center_outer.dbo.bulletin AS a
+        INNER JOIN center_outer.dbo.ean_upc AS b ON a.code = b.code
         WHERE
         (
         DATEDIFF(DAY, login_date, getdate()) >= 7
@@ -52,8 +52,8 @@
         a.log_date,
         b.login_date
         FROM
-        center_sync.dbo.bulletin AS a
-        INNER JOIN center_sync.dbo.ean_upc AS b ON a.code = b.code
+        center_outer.dbo.bulletin AS a
+        INNER JOIN center_outer.dbo.ean_upc AS b ON a.code = b.code
         WHERE
         (
         DATEDIFF(DAY, login_date, getdate()) >= 7
@@ -84,9 +84,9 @@
             b.f_id,
             b.logout_date
         FROM
-            center_sync.dbo.firm a
-        LEFT JOIN center_sync.dbo.ean_upc b ON a.f_id = b.f_id
-        LEFT JOIN center_sync.dbo.bulletin c ON c.code = b.code
+            center_outer.dbo.firm a
+        LEFT JOIN center_outer.dbo.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 = #{eanUpcEntity.fId}
         AND b.code = #{eanUpcEntity.code}

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

@@ -53,7 +53,7 @@
         FROM
             firm a
         LEFT JOIN ean_upc b ON a.f_id = b.f_id
-        LEFT JOIN center_sync.dbo.bulletin c ON c.code = b.code
+        LEFT JOIN center_outer.dbo.bulletin c ON c.code = b.code
         WHERE
             a.f_id = #{f_id}
         AND b.code = #{code}
@@ -69,7 +69,7 @@
         FIRM_NAME_NOW,
         AUDIT_DATE
         FROM
-        center_sync.dbo.CHANGE_HISTORY
+        center_outer.dbo.CHANGE_HISTORY
         WHERE
         (FIRM_NAME <> FIRM_NAME_now)
         AND (

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

@@ -120,8 +120,8 @@
         <if test="newsParams.status !=null and newsParams.status !=''">
             and status =#{newsParams.status}
         </if>
-        <if test="newsParams.auditor !=null and newsParams.auditor !=''">
-            and auditor =#{newsParams.auditor}
+        <if test="newsParams.editor !=null and newsParams.editor !=''">
+            and editor  like concat('%',#{newsParams.editor},'%')
         </if>
         <choose>
             <when test="newsParams.sidx!=null and newsParams.sidx!=''">
@@ -198,6 +198,22 @@
         select * from news where status=1 and levels>0 and classid=#{newsParams.classId} ORDER BY levels DESC,showtime DESC,id DESC
     </select>
 
+    <select id="getT0P9" resultType="int" >
+        SELECT
+            TOP 9 aa.id
+        FROM
+            TopIcNews AS aa
+        LEFT JOIN news AS bb ON aa.newsid = bb.id
+        WHERE
+            bb.status = 1
+        AND bb.levels = 1
+        AND aa.classid = #{classid}
+        AND keyword LIKE '%党史学习教育%'
+        ORDER BY
+            levels DESC,
+            releasedate DESC
+    </select>
+
     <select id="getHdbdList" resultMap="newsMap">
                 SELECT
                         a.classid,
@@ -209,7 +225,8 @@
                         b.author,
                         b.updatedate,
                         b.levels,
-                        b.id
+                        b.id,
+                        b.directpath
                 FROM
                         TopIcNews AS a
                                 LEFT JOIN news AS b ON a.newsid = b.id
@@ -217,10 +234,17 @@
                         status = 1
                        and  levels > 0
                   AND a.classid =#{newsParams.classId}
+                <if test="newsParams.ids!=null and  newsParams.ids.size() != 0">
+                    and b.id not in
+                     <foreach collection="newsParams.ids" item="item1" open="(" close=")" index="i" separator=",">
+                      #{item1,jdbcType=INTEGER}
+                      </foreach>
+                    </if>
                     and b.id is not null
                     ORDER BY
-                        levels DESC,
-                        releasedate DESC
+                        b.levels + 1 DESC,
+                        b.id+1 DESC
+
     </select>
 
     <select id="selectClassName" resultType="java.lang.String">
@@ -495,7 +519,8 @@ order by t.levels DESC,t.knowledgeInfoid DESC
                 b.author,
                 b.updatedate,
                 b.levels,
-                b.id
+                b.id,
+                b.directpath
         FROM
                 TopIcNews AS a
                         LEFT JOIN news AS b ON a.newsid = b.id
@@ -520,7 +545,9 @@ order by t.levels DESC,t.knowledgeInfoid DESC
                 b.author,
                 b.updatedate,
                 b.levels,
-                b.id
+                b.id,
+                b.directpath
+
         FROM
                 TopIcNews AS a
                         LEFT JOIN news AS b ON a.newsid = b.id
@@ -542,7 +569,8 @@ order by t.levels DESC,t.knowledgeInfoid DESC
 	b.author,
 	b.updatedate,
 	b.levels,
-	b.id
+	b.id,
+	b.directpath
 FROM
 	TopIcNews AS a
 LEFT JOIN news AS b ON a.newsid = b.id