【修改】政府采购

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

 package io.office.modules.manage.controller;
 
 
-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.common.annotation.SysLog;
+import io.office.common.utils.PageUtils;
+import io.office.common.utils.R;
 import io.office.modules.app.annotation.Login;
 import io.office.modules.manage.entity.DocEntity;
 import io.office.modules.manage.entity.NewsEntity;
 import io.office.modules.manage.entity.dto.NewsParams;
+import io.office.modules.manage.service.DocService;
 import io.office.modules.sys.controller.AbstractController;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
-import io.office.modules.manage.service.DocService;
-import io.office.common.utils.PageUtils;
-import io.office.common.utils.R;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
 
 
 
@@ -150,4 +153,5 @@ public class DocController extends AbstractController {
     }
 
 
+
 }

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

@@ -134,7 +134,7 @@ public class NewtopicController extends AbstractController {
         newtopicEntity.setChecktime(date);
         newtopicEntity.setCheckflag(Integer.valueOf(params.getStatus()));
         QueryWrapper<NewtopicEntity> newtopicEntityQueryWrapper = new QueryWrapper<>();
-        newtopicEntityQueryWrapper.eq("classid",newtopicEntity.getClassid());
+        newtopicEntityQueryWrapper.eq("classid",params.getId());
         newtopicService.update(newtopicEntity,newtopicEntityQueryWrapper);
         return R.ok("审核通过!");
     }

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

@@ -3,7 +3,6 @@ package io.office.modules.manage.controller;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.office.common.annotation.SysLog;
 import io.office.common.utils.PageUtils;
 import io.office.common.utils.R;
 import io.office.modules.app.annotation.Login;
@@ -72,7 +71,7 @@ public class TycpdmFirmController extends AbstractController {
     @RequestMapping("/api/test")
     @Login
     public void testRed(HttpServletResponse response) throws Exception {
-        response.sendRedirect("http://manage.gds.org.cn/Original/WWW/registerOrLoginFromAncc.aspx?uname=test_tru&pwd=88DA15B9F9F602F0D32D46808652B06DC6E939D1424CE39F69A2AC39743F7ED7591975685B543E1D&regist_or_login_from_ancc=d67626ce2c09cbb4c6867eb65c945b53&dept=-2");
+        response.sendRedirect("https://manage.gds.org.cn/Original/WWW/registerOrLoginFromAncc.aspx?uname=test_tru&pwd=88DA15B9F9F602F0D32D46808652B06DC6E939D1424CE39F69A2AC39743F7ED7591975685B543E1D&regist_or_login_from_ancc=d67626ce2c09cbb4c6867eb65c945b53&dept=-2");
     }
 
     /**

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

@@ -54,4 +54,8 @@ public class NewsParams extends PageParams {
     private String clanguage;
 
     private List<Integer> ids;
+    @TableField(exist = false)
+    private Integer id;
+
+
 }

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

@@ -36,7 +36,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
-import java.util.regex.Pattern;
 
 @Slf4j
 @Service("tycpdmFirmService")
@@ -602,7 +601,7 @@ public class TycpdmFirmServiceImpl extends ServiceImpl<TycpdmFirmDao, TycpdmFirm
         }
         regist_or_login_from_ancc = dept + "{regist_or_login_from_ancc}";
         regist_or_login_from_ancc = MD5Util.md5Encrypt32Lower(regist_or_login_from_ancc);
-        String url = "http://manage.gds.org.cn/Original/WWW/registerOrLoginFromAncc.aspx?uname=" + username + "&pwd=" + pass + "&regist_or_login_from_ancc=" + regist_or_login_from_ancc + "&dept=" + dept;
+        String url = "https://manage.gds.org.cn/Original/WWW/registerOrLoginFromAncc.aspx?uname=" + username + "&pwd=" + pass + "&regist_or_login_from_ancc=" + regist_or_login_from_ancc + "&dept=" + dept;
         return url;
     }
 
@@ -647,7 +646,7 @@ public class TycpdmFirmServiceImpl extends ServiceImpl<TycpdmFirmDao, TycpdmFirm
         }
         regist_or_login_from_ancc = dept + "{regist_or_login_from_ancc}";
         regist_or_login_from_ancc = MD5Util.md5Encrypt32Lower(regist_or_login_from_ancc);
-        String url = "http://manage.gds.org.cn/Original/WWW/registerOrLoginFromAncc.aspx?uname=" + username + "&pwd=" + pass + "&regist_or_login_from_ancc=" + regist_or_login_from_ancc + "&dept=" + dept;
+        String url = "https://manage.gds.org.cn/Original/WWW/registerOrLoginFromAncc.aspx?uname=" + username + "&pwd=" + pass + "&regist_or_login_from_ancc=" + regist_or_login_from_ancc + "&dept=" + dept;
         return url;
 
     }

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

@@ -26,6 +26,7 @@ import java.util.Map;
  *
  * @author Mark sunlightcs@gmail.com
  */
+@CrossOrigin
 @RestController
 @RequestMapping("/sys/config")
 public class SysConfigController extends AbstractController {
@@ -95,4 +96,13 @@ public class SysConfigController extends AbstractController {
 		return R.ok();
 	}
 
+
+	@GetMapping("/api/config")
+	public R config(){
+		String IS_BLACK_WHITE = sysConfigService.getConfigObject("IS_BLACK_WHITE", String.class);
+
+		return R.ok().put("data", IS_BLACK_WHITE);
+	}
+
+
 }

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

@@ -23,10 +23,12 @@ import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.CrossOrigin;
 
 import java.util.Arrays;
 import java.util.Map;
 
+@CrossOrigin
 @Service("sysConfigService")
 public class SysConfigServiceImpl extends ServiceImpl<SysConfigDao, SysConfigEntity> implements SysConfigService {
 	@Autowired