Merge remote-tracking branch 'origin/master'

niying

2024-01-29 0cbb588628da7bcdca146420a672916a76df2e0c

 src/main/java/com/itstyle/mdm/service/impl/MdmServiceImpl.java

@@ -29,7 +29,7 @@

    @Override
    @Transactional
    public JSONArray saveMdmData(JSONArray recordArray) {
    public JSONArray saveMdmData(JSONArray recordArray,String name) {
        JSONArray newJsonArray = new JSONArray();
        int size = recordArray.size();
        Object[] params = new  Object[]{};
@@ -43,7 +43,7 @@
                String updatedat = jsonObj.getString("updatedat");
                String updatetime = jsonObj.getString("updatetime");
                mdmData = new MdmData();
                mdmData.setType("局域物料名称编码数据获取");
                mdmData.setType(name);
                mdmData.setId(id);
                mdmData.setTgcoriginalCode(tgcoriginalcode);
                mdmData.setUpdatedat(updatedat);
@@ -76,6 +76,54 @@
    }

    @Override
    @Transactional
    public JSONArray saveMdmUnitData(JSONArray recordArray, String name) {
        JSONArray newJsonArray = new JSONArray();
        int size = recordArray.size();
        Object[] params = new  Object[]{};
        MdmData mdmData = null;
        if(size != 0){
            for (int i = 0; i < size; i++) {
                String json = recordArray.get(i).toString();
                JSONObject jsonObj = JSON.parseObject(json);
                String id = jsonObj.getString("code");
                String tgcoriginalcode = jsonObj.getString("originalcode");
                //String updatedat = jsonObj.getString("updatedat");
                String updatetime = jsonObj.getString("updatetime");
                mdmData = new MdmData();
                mdmData.setType(name);
                mdmData.setId(id);
                mdmData.setTgcoriginalCode(tgcoriginalcode);
                mdmData.setUpdatedat("");
                mdmData.setUpdatetime(updatetime);
                String countSql = "SELECT mdm.uuid,mdm.id,mdm.tgcoriginalCode,mdm.updatedat,mdm.updatetime FROM mdm_data AS mdm where mdm.tgcoriginalCode='"+tgcoriginalcode+"' ";
                List<MdmData> list = dynamicQuery.nativeQueryList(MdmData.class,countSql,params);
                if(list.size()>0){
                    //说明存在数据
                    for (MdmData mdm : list) {
                        String updatetime1 = mdm.getUpdatetime();
                        if(updatetime1.equals(updatetime)){
                            //数据无变化
                            continue;
                        }
                        jsonObj.put("renewstatus","update");
                        newJsonArray.add(jsonObj);
                        //数据存在变化
                        dynamicQuery.update(mdm);//更新数据
                    }
                }else {
                    jsonObj.put("renewstatus","new");
                    newJsonArray.add(jsonObj);
                    //说明该数据为新数据
                    mdmData.setUuid(UUID.randomUUID().toString());
                    dynamicQuery.save(mdmData);
                }
            }
        }
        return newJsonArray;
    }

    @Override
    public List<SysConfigEntity> querySysConfigs(String interfaceName) {
        Object[] params = new  Object[]{interfaceName};
        String countSql = "select id,ADDRESS as address,DESCRIPTION as description,cronExpression,isEnable,sysName,association from sys_config where isEnable='启用' and association=?";