Bladeren bron

第三方系统迁移到海云程序调整2019.06.21

lijihong 6 jaren geleden
bovenliggende
commit
d1b4c3c372

+ 3 - 0
TRS.WCM.Developer/myconfig/application.properties

@@ -0,0 +1,3 @@
+mysql_connectUrl = jdbc:mysql://127.0.0.1:3306/liion?characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
+user_name = root
+pswd = zxcv1234

+ 36 - 9
TRS.WCM.Developer/test/com/trs/web2frame/WCMServiceCallerTest.java

@@ -11,6 +11,7 @@ import com.trs.dto.SiteDTO;
 import com.trs.infra.common.BizError;
 import com.trs.infra.common.WCMException;
 import com.trs.infra.util.CMyString;
+import com.trs.support.ApplicationProperties;
 import com.trs.util.DBUtil;
 import com.trs.web2frame.dispatch.Dispatch;
 import com.trs.web2frame.eventhandler.ICallbackCompleteHandler;
@@ -45,9 +46,9 @@ public class WCMServiceCallerTest extends TestCase {
 	// "D:\\Webapps\\TRS_WCM_52\\Tomcat\\webapps\\wcm\\infoview\\infoview.js";
 	public static final String FILE_1 = "/Users/macro.li/TRS/logs/j01.txt";
 
-	private static final String connectUrl = "jdbc:mysql://127.0.0.1:3306/liion?characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull";
-	private static final String userName = "root";
-	private static final String pswd = "zxcv1234";
+	private static final String connectUrl = ApplicationProperties.get("mysql_connectUrl");
+	private static final String userName = ApplicationProperties.get("user_name");
+	private static final String pswd = ApplicationProperties.get("pswd");
 	private static Connection connection;
 
     @Override
@@ -209,17 +210,25 @@ public class WCMServiceCallerTest extends TestCase {
 	    siteDTO.setSitedesc("乐至市");
 	    siteDTO.setDatapath("lezshi1");
 	    siteDTO.setWebhttp("http://192.168.200.124/pub/lezshi");
+        //设置视图ID,这个ID是海云全媒体采编中的视图ID。项目组可以根据自己可以将站点栏目指定到海云中已存在的视图下。
+        String siteCode = "1";
+        int viewId = queryViewIdByCode(siteCode);
         siteDTO.setViewinfoid(36);
         siteDTO.setDetailtemplate(7086);
         siteDTO.setOutlinetemplate(7084);
 	    siteDTO.setChnloutlinetemp(7085);
-	    siteDTO.setSrcSiteCode("1");
+	    siteDTO.setSrcSiteCode(siteCode);
 
         list.add(siteDTO);
         //end TODO 需要项目组根据第三方项目情况,填写相应数据
         testSaveSite(list);
     }
 
+    private int queryViewIdByCode(String code) throws BizError {
+        //TODO 项目组定义站点栏目绑定对应海云已存在的视图ID
+        throw new BizError("项目组自定义站点栏目绑定对应海云已存在的视图ID");
+    }
+
     /**
      * 栏目迁移
      * @throws WCMException
@@ -230,15 +239,16 @@ public class WCMServiceCallerTest extends TestCase {
 
         //start TODO 需要项目组根据第三方项目情况,填写相应数据 具体参数见:ChannelDTO
         ChannelDTO channelDTO = new ChannelDTO();
-
+        String channelCode = "13";
+        channelDTO.setSrcChannelCode(channelCode);
         channelDTO.setChnlname("视频新闻");
         channelDTO.setChnldesc("视频新闻");
         channelDTO.setChnldatapath("spxw");
-        channelDTO.setViewinfoid(36);
         channelDTO.setDetailtemplate(0);
         channelDTO.setOutlinetemplate(0);
         //如果是根节点 parenId = 0; 如果不是根节点需要查询HYCLOUDCHANNELRELATION 表数据
-        channelDTO.setParentid(0);
+        int parentId = queryPatentIdByChannelCode(channelCode);
+        channelDTO.setParentid(parentId);
         String srcSiteCode = "1";
         //通过第三方系统的站点 唯一表示 获取迁移后的站点
         int siteId = querySiteIdBySrcSiteCode(srcSiteCode);
@@ -246,13 +256,30 @@ public class WCMServiceCallerTest extends TestCase {
             throw new BizError(String.format("该站点[%s]没有迁移",srcSiteCode));
         }
         channelDTO.setSiteid(siteId);
-        channelDTO.setSrcChannelCode("13");
+        //设置视图ID,这个ID是海云全媒体采编中的视图ID。
+        int viewId = queryViewIdByCode(channelCode);
+        channelDTO.setViewinfoid(viewId);
 
         list.add(channelDTO);
         //end TODO 需要项目组根据第三方项目情况,填写相应数据
         testSaveChannel(list);
     }
 
+    private int queryPatentIdByChannelCode(String channelCode) throws BizError {
+
+        String sql = "SELECT CHANNELID FROM HYCLOUDCHANNELRELATION WHERE SRCCHANNELCODE = ?;";
+
+        List<String> list = new ArrayList<>();
+        list.add(channelCode);
+        List<String> result = DBUtil.getDBManager().sqlExecuteStringsQuery(connection, sql, list);
+
+        int channelId = 0;
+        if (result != null && result.size() == 1){
+            channelId = Integer.parseInt(result.get(0));
+        }
+        return channelId;
+    }
+
     private int querySiteIdBySrcSiteCode(String srcSiteCode) throws BizError {
 
         String sql = "SELECT SITEID FROM HYCLOUDSITERELATION WHERE SRCSITECODE = ?;";
@@ -449,7 +476,7 @@ public class WCMServiceCallerTest extends TestCase {
 
     public void testPostSaveChannelMapping() throws WCMException{
 
-        saveChannelMapping(1, "12");
+        saveChannelMapping(2, "121");
     }
 
     private void saveChannelMapping(int channelid, String srcChannelCode) throws WCMException {