Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

edu-article/JkEdu/src/com/yihu/jk/dao/ArticleDao.java

@@ -760,7 +760,7 @@ public class ArticleDao {
			param.append(" and Articlelevel = ? ");
			sql.addParamValue(vo.getArticlelevel());
		}
		if (StringUtil.isNotEmpty(vo.getIsAuthentication())) {
		if (vo.getIsAuthentication() != null ) {
			param.append(" and IsAuthentication = ? ");
			sql.addParamValue(vo.getIsAuthentication());
		}
@@ -800,7 +800,7 @@ public class ArticleDao {
            param.append(" and InsertTime <= ? ");
            sql.addParamValue(vo.getEndTime());
        }
        if (StringUtil.isNotEmpty(vo.getIsAuthentication())) {
        if (vo.getIsAuthentication() != null ) {
            param.append(" and IsAuthentication = ? ");
            sql.addParamValue(vo.getEndTime());
        }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/data/DataHandlingController.java

@@ -99,7 +99,7 @@ public class DataHandlingController extends BaseController {
        }
    }
    @RequestMapping(value = "/getArticleListToNewDataBase",method = RequestMethod.POST)
    @RequestMapping(value = "/getArticleListToNewDataBase",method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation("文章列表转移")
    public String getArticleListToNewDataBase(){
@@ -111,7 +111,7 @@ public class DataHandlingController extends BaseController {
        }
    }
    @RequestMapping(value = "/getArticleCollectToNewDataBase",method = RequestMethod.POST)
    @RequestMapping(value = "/getArticleCollectToNewDataBase",method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation("文章收藏转移")
    public String getArticleCollectToNewDataBase(){
@@ -123,7 +123,7 @@ public class DataHandlingController extends BaseController {
        }
    }
    @RequestMapping(value = "/getArticleBehaviorToNewDataBase",method = RequestMethod.POST)
    @RequestMapping(value = "/getArticleBehaviorToNewDataBase",method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation("文章行为转移")
    public String getArticleBehaviorToNewDataBase(){
@@ -135,7 +135,7 @@ public class DataHandlingController extends BaseController {
        }
    }
    @RequestMapping(value = "/getArticleSendToEs",method = RequestMethod.POST)
    @RequestMapping(value = "/getArticleSendToEs",method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation("已发送文章列表转移Es")
    public String getArticleSendToEs(){

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/jkedu/controller/EduArticleController.java

@@ -66,59 +66,59 @@ public class EduArticleController extends BaseController{
            return  new ResultOneModel(code,ErrorStateMessage.getMessge(code)+","+e.getMessage());
        }
    }
    @RequestMapping(value = "/getArticleListToNewDataBase",method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation("文章列表转移")
    public String getArticleListToNewDataBase(){
        boolean flag = eduArticleService.getArticleListToNewDataBase();
        if (flag){
            return write(200,"数据转移成功！");
        }else{
            return write(0,"数据转移失败！");
        }
    }
    @RequestMapping(value = "/getArticleCollectToNewDataBase",method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation("文章收藏转移")
    public String getArticleCollectToNewDataBase(){
        boolean flag = eduArticleService.getArticleCollectToNewDataBase();
        if (flag){
            return write(200,"数据转移成功！");
        }else{
            return write(0,"数据转移失败！");
        }
    }
    @RequestMapping(value = "/getArticleBehaviorToNewDataBase",method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation("文章行为转移")
    public String getArticleBehaviorToNewDataBase(){
        boolean flag = eduArticleService.getArticleBehaviorToNewDataBase();
        if (flag){
            return write(200,"数据转移成功！");
        }else{
            return write(0,"数据转移失败！");
        }
    }
    @RequestMapping(value = "/getArticleSendToEs",method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation("已发送文章列表转移Es")
    public String getArticleSendToEs(){
        boolean flag = eduArticleService.getArticleSendedListToEs();
        if (flag){
            return write(200,"数据转移成功！");
        }else{
            return write(0,"数据转移失败！");
        }
    }
    @RequestMapping(value = "/save",method = RequestMethod.POST)
    @ResponseBody
    public String save(){
        eduArticleService.save();
        return "";
    }
//
//    @RequestMapping(value = "/getArticleListToNewDataBase",method = RequestMethod.POST)
//    @ResponseBody
//    @ApiOperation("文章列表转移")
//    public String getArticleListToNewDataBase(){
//        boolean flag = eduArticleService.getArticleListToNewDataBase();
//        if (flag){
//            return write(200,"数据转移成功！");
//        }else{
//            return write(0,"数据转移失败！");
//        }
//    }
//
//    @RequestMapping(value = "/getArticleCollectToNewDataBase",method = RequestMethod.POST)
//    @ResponseBody
//    @ApiOperation("文章收藏转移")
//    public String getArticleCollectToNewDataBase(){
//        boolean flag = eduArticleService.getArticleCollectToNewDataBase();
//        if (flag){
//            return write(200,"数据转移成功！");
//        }else{
//            return write(0,"数据转移失败！");
//        }
//    }
//
//    @RequestMapping(value = "/getArticleBehaviorToNewDataBase",method = RequestMethod.POST)
//    @ResponseBody
//    @ApiOperation("文章行为转移")
//    public String getArticleBehaviorToNewDataBase(){
//        boolean flag = eduArticleService.getArticleBehaviorToNewDataBase();
//        if (flag){
//            return write(200,"数据转移成功！");
//        }else{
//            return write(0,"数据转移失败！");
//        }
//    }
//
//    @RequestMapping(value = "/getArticleSendToEs",method = RequestMethod.POST)
//    @ResponseBody
//    @ApiOperation("已发送文章列表转移Es")
//    public String getArticleSendToEs(){
//        boolean flag = eduArticleService.getArticleSendedListToEs();
//        if (flag){
//            return write(200,"数据转移成功！");
//        }else{
//            return write(0,"数据转移失败！");
//        }
//    }
//
//    @RequestMapping(value = "/save",method = RequestMethod.POST)
//    @ResponseBody
//    public String save(){
//        eduArticleService.save();
//        return "";
//    }
}

patient-co/patient-co-wlyy/src/main/resources/application-prod.yml

@@ -10,6 +10,10 @@ spring:
      url: jdbc:mysql://59.61.92.90:9069/device?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
      username: wlyy
      password: jkzlehr@123
    jkedu:
      url: jdbc:mysql://59.61.92.90:9069/jkedudb?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
      username: wlyy
      password: jkzlehr@123
  redis:
     host: 27.155.101.77 # Redis server host.
@@ -101,11 +105,11 @@ pushMes:
es:
  index:
    HealthEduArticlePatient: health_edu_article_patient_prod
    HealthEduArticlePatient: health_edu_article_patient
    Statistics: wlyy_quota_prod
    FollowUp: wlyy_followup
  type:
    HealthEduArticlePatient: health_edu_article_patient_prod
    HealthEduArticlePatient: health_edu_article_patient
    Statistics: wlyy_quota_prod
    FollowUpContent: wlyy_followup_content
  host:  http://59.61.92.90:9065,http://59.61.92.90:9067
@@ -115,7 +119,7 @@ es:
#集美宣教居民端健康文章
jkEdu:
  web:
    articleBaseUrl:
    articleBaseUrl: http://www.xmtyw.cn/
#消息队列
activemq: