Skip to content

G
gs1-office-web-sit
Commit ac5f58cd by 吴迪
Options

【新增】修改代码

parent b18c4f67
Showing with 199 additions and 32 deletions
src/main/java/io/office/modules/manage/controller/GLNController.java
......@@ -228,6 +228,11 @@ public class GLNController {
@RequestMapping("/api/domesticCodeProductionNews")
public R domesticCodeProductionNews(@RequestBody DomesticCodeVo domesticCodeVo, HttpServletRequest request) {
if(StringUtils.isNotBlank(domesticCodeVo.getCode())) {
if(domesticCodeVo.getCode().length()<13) {
return R.error("商品条码卡位数太少！请输入正确的13位或14位商品条码！");
}
SearchgtinlogEntity searchgtinlogEntity = new SearchgtinlogEntity();
searchgtinlogEntity.setCreatedate(new Date());
searchgtinlogEntity.setIp(IPUtils.getIpAddr(request));
......@@ -269,6 +274,9 @@ public class GLNController {
}
}
}
}
return R.error("查询失败！");
}
......
src/main/java/io/office/modules/manage/service/impl/TycpdmFirmServiceImpl.java
......@@ -67,9 +67,6 @@ public class TycpdmFirmServiceImpl extends ServiceImpl<TycpdmFirmDao, TycpdmFirm
@Value("${uploadFileQYOne}")
String uploadFileQYOne;
@Autowired
private DomainListProperties domainListProperties;
@Override
public PageUtils queryPage(Map<String, Object> params) {
IPage<TycpdmFirmEntity> page = this.page(
......@@ -632,7 +629,7 @@ public class TycpdmFirmServiceImpl extends ServiceImpl<TycpdmFirmDao, TycpdmFirm
String phone_M = DESUtils.byteToHexString(DESUtils.DES_CBC_Encrypt(phone.getBytes(),"loginkey".getBytes()));
String password = memberUser.getPassword();//名文密码
String password_M = DESUtils.byteToHexString(DESUtils.DES_CBC_Encrypt(password.getBytes(),"loginkey".getBytes()));
String url=domainListProperties.getDomain()+"redirectBusinessHall/anccoh/login?method=gdsLoginSSO&gdsCode="+phone_M+"&password="+password_M;
String url="http://wsdt.gs1cn.org/anccoh/login?method=gdsLoginSSO&gdsCode="+phone_M+"&password="+password_M;
return url;
}else if (userType==3){
phone=memberUser.getPhone();//手机号
......@@ -641,7 +638,7 @@ public class TycpdmFirmServiceImpl extends ServiceImpl<TycpdmFirmDao, TycpdmFirm
}
String phone_M = DESUtils.byteToHexString(DESUtils.DES_CBC_Encrypt(phone.getBytes(),"loginkey".getBytes()));
String url=domainListProperties.getDomain()+"redirectBusinessHall/anccoh/login?method=phoneSSO&phone="+phone_M;
String url="http://wsdt.gs1cn.org/anccoh/login?method=phoneSSO&phone="+phone_M;
return url;
}
......
src/main/java/io/office/modules/manage/transfer/TransferController.java
......@@ -59,6 +59,8 @@ public class TransferController {
@Autowired
private PolicyService policyService;
@Autowired
private KnowledgeinfoService knowledgeinfoService;
@RequestMapping("/api/indexCarouselManage")
// @RequiresPermissions("generator:topicnews:list")
......@@ -1245,6 +1247,168 @@ public class TransferController {
}
@RequestMapping("/api/knowledgeInfo")
// @RequiresPermissions("generator:topicnews:list")
public R knowledgeInfo() {
QueryWrapper<KnowledgeinfoEntity> indexCarouselManageEntityQueryWrapper = new QueryWrapper<>();
int count = knowledgeinfoService.count(indexCarouselManageEntityQueryWrapper);
if (count > 0) {
boolean flag = true;
int n = 1;
while (flag) {
int limit = 10;
int pages = 0;
if ((count % limit) == 0) {
pages = (count / limit);
} else {
pages = (count / limit) + 1;
}
if (n <= pages) {
IPage<KnowledgeinfoEntity> pageData = knowledgeinfoService.page(new Page(n, limit), indexCarouselManageEntityQueryWrapper);
if (CollectionUtils.isNotEmpty(pageData.getRecords())) {
for (KnowledgeinfoEntity knowledgeinfoEntity : pageData.getRecords()) {
KnowledgeinfoEntity knowledgeinfoEntityDB = new KnowledgeinfoEntity();
//如果不为空
if (StringUtils.isNotBlank(knowledgeinfoEntity.getDirectpath())) {
//先判断是否是官网的前缀
if (knowledgeinfoEntity.getDirectpath().startsWith("http://www.gs1cn.org")) {
//官网的链接
knowledgeinfoEntityDB.setDirectpath(knowledgeinfoEntity.getDirectpath().replaceAll("http://www.gs1cn.org", domainListProperties.getDomain()));
}
if (knowledgeinfoEntity.getDirectpath().startsWith("http://www.ancc.org.cn")) {
//官网的链接
knowledgeinfoEntityDB.setDirectpath(knowledgeinfoEntity.getDirectpath().replaceAll("http://www.ancc.org.cn", domainListProperties.getDomain()));
}
if (knowledgeinfoEntity.getDirectpath().startsWith("http://81.68.189.225:8080")) {
//官网的链接
knowledgeinfoEntityDB.setDirectpath(knowledgeinfoEntity.getDirectpath().replaceAll("http://81.68.189.225:8080", domainListProperties.getDomain()));
}
if (knowledgeinfoEntity.getDirectpath().indexOf("news/article.aspx") > -1) {
knowledgeinfoEntityDB.setDirectpath(knowledgeinfoEntity.getDirectpath().replaceAll("news/article.aspx", "News/msg"));
}
if (knowledgeinfoEntity.getDirectpath().indexOf("News/article.aspx") > -1) {
knowledgeinfoEntityDB.setDirectpath(knowledgeinfoEntity.getDirectpath().replaceAll("News/article.aspx", "News/msg"));
}
if (knowledgeinfoEntity.getDirectpath().indexOf("news/article_admin.aspx") > -1) {
knowledgeinfoEntityDB.setDirectpath(knowledgeinfoEntity.getDirectpath().replaceAll("news/article_admin.aspx", "News/msg"));
}
if (knowledgeinfoEntity.getDirectpath().indexOf("News/VideoDetails.aspx") > -1) {
knowledgeinfoEntityDB.setDirectpath(knowledgeinfoEntity.getDirectpath().replaceAll("News/VideoDetails.aspx", "News/msgVideo"));
}
if (knowledgeinfoEntity.getDirectpath().indexOf("/Org/Intro.aspx") > -1) {
knowledgeinfoEntityDB.setDirectpath(knowledgeinfoEntity.getDirectpath().replaceAll("/Org/Intro.aspx", domainListProperties + "/Org/Intro"));
}
if (knowledgeinfoEntity.getDirectpath().indexOf("News/PicNews.aspx") > -1) {
knowledgeinfoEntityDB.setDirectpath(knowledgeinfoEntity.getDirectpath().replaceAll("News/PicNews.aspx", "News/msg"));
}
if (knowledgeinfoEntity.getDirectpath().indexOf("news/newsone.asp") > -1) {
knowledgeinfoEntityDB.setDirectpath(knowledgeinfoEntity.getDirectpath().replaceAll("news/newsone.asp", "News/msg"));
}
if (knowledgeinfoEntity.getDirectpath().indexOf("Service/notice/article.aspx") > -1) {
knowledgeinfoEntityDB.setDirectpath(knowledgeinfoEntity.getDirectpath().replaceAll("Service/notice/article.aspx", "News/NoticeArticle"));
}
if (knowledgeinfoEntity.getDirectpath().indexOf("News/VideoDetails.aspx") > -1) {
knowledgeinfoEntityDB.setDirectpath(knowledgeinfoEntity.getDirectpath().replaceAll("News/VideoDetails.aspx", "News/msgVideo"));
}
}
if (StringUtils.isNotBlank(knowledgeinfoEntity.getContent())) {
if (knowledgeinfoEntity.getContent().indexOf("http://www.gs1cn.org") > -1 && !(knowledgeinfoEntity.getContent().indexOf("http://www.gs1cn.org/UserImages") > -1) && !(knowledgeinfoEntity.getContent().indexOf("http://www.ancc.org.cn/UserFiles") > -1)) {
//官网的链接
knowledgeinfoEntityDB.setContent(knowledgeinfoEntity.getContent().replaceAll("http://www.gs1cn.org", domainListProperties.getDomain()));
}
if (knowledgeinfoEntity.getContent().indexOf("http://www.ancc.org.cn") > -1 && !(knowledgeinfoEntity.getContent().indexOf("http://www.gs1cn.org/UserImages") > -1) && !(knowledgeinfoEntity.getContent().indexOf("http://www.ancc.org.cn/UserFiles") > -1)) {
//官网的链接
knowledgeinfoEntityDB.setContent(knowledgeinfoEntity.getContent().replaceAll("http://www.ancc.org.cn", domainListProperties.getDomain()));
}
if (knowledgeinfoEntity.getContent().indexOf("http://81.68.189.225:8080") > -1) {
//官网的链接
knowledgeinfoEntityDB.setContent(knowledgeinfoEntity.getContent().replaceAll("http://81.68.189.225:8080", domainListProperties.getDomain()));
}
if (knowledgeinfoEntity.getContent().indexOf("news/article.aspx") > -1) {
knowledgeinfoEntityDB.setContent(knowledgeinfoEntity.getContent().replaceAll("news/article.aspx", "News/msg"));
}
if (knowledgeinfoEntity.getContent().indexOf("News/article.aspx") > -1) {
knowledgeinfoEntityDB.setContent(knowledgeinfoEntity.getContent().replaceAll("News/article.aspx", "News/msg"));
}
if (knowledgeinfoEntity.getContent().indexOf("news/article_admin.aspx") > -1) {
knowledgeinfoEntityDB.setContent(knowledgeinfoEntity.getContent().replaceAll("news/article_admin.aspx", "News/msg"));
}
if (knowledgeinfoEntity.getContent().indexOf("News/VideoDetails.aspx") > -1) {
knowledgeinfoEntityDB.setContent(knowledgeinfoEntity.getContent().replaceAll("News/VideoDetails.aspx", "News/msgVideo"));
}
if (knowledgeinfoEntity.getContent().indexOf("/Org/Intro.aspx") > -1) {
knowledgeinfoEntityDB.setContent(knowledgeinfoEntity.getContent().replaceAll("/Org/Intro.aspx", domainListProperties + "/Org/Intro"));
}
if (knowledgeinfoEntity.getContent().indexOf("News/PicNews.aspx") > -1) {
knowledgeinfoEntityDB.setContent(knowledgeinfoEntity.getContent().replaceAll("News/PicNews.aspx", "News/msg"));
}
if (knowledgeinfoEntity.getContent().indexOf("news/newsone.asp") > -1) {
knowledgeinfoEntityDB.setContent(knowledgeinfoEntity.getContent().replaceAll("news/newsone.asp", "News/msg"));
}
if (knowledgeinfoEntity.getContent().indexOf("Service/notice/article.aspx") > -1) {
knowledgeinfoEntityDB.setContent(knowledgeinfoEntity.getContent().replaceAll("Service/notice/article.aspx", "News/NoticeArticle"));
}
if (knowledgeinfoEntity.getContent().indexOf("News/VideoDetails.aspx") > -1) {
knowledgeinfoEntityDB.setContent(knowledgeinfoEntity.getContent().replaceAll("News/VideoDetails.aspx", "News/msgVideo"));
}
if (knowledgeinfoEntity.getContent().indexOf("/News/msg?Id") > -1) {
knowledgeinfoEntityDB.setContent(knowledgeinfoEntity.getContent().replaceAll("/News/msg\\?Id", "/News/msg?id"));
}
}
if (StringUtils.isNotBlank(knowledgeinfoEntity.getContent())) {
// if (knowledgeinfoEntity.getContent().indexOf("<img src=\"/UserFiles/") > -1) {//官网的链接
// knowledgeinfoEntityDB.setContent(knowledgeinfoEntity.getContent().replaceAll("<img src=\"/UserFiles/", "<img src=\"" + fileRequestPrefix + "UserFiles/"));
// }
// if (knowledgeinfoEntity.getContent().indexOf("<img src=\"/UserImages") > -1) {//官网的链接
// knowledgeinfoEntityDB.setContent(knowledgeinfoEntity.getContent().replaceAll("<img src=\"UserImages", "<img src=\"" + fileRequestPrefix + "UserImages/"));
// }
if (knowledgeinfoEntity.getContent().indexOf("src=\"/UserFiles") > -1) {//官网的链接
knowledgeinfoEntityDB.setContent(knowledgeinfoEntity.getContent().replaceAll("src=\"/UserFiles", "src=\"" + fileRequestPrefix + "UserFiles"));
}
if (knowledgeinfoEntity.getContent().indexOf("src=\"/UserImages") > -1) {//官网的链接
knowledgeinfoEntityDB.setContent(knowledgeinfoEntity.getContent().replaceAll("src=\"/UserImages", "src=\"" + fileRequestPrefix + "UserImages"));
}
}
//修改
if (StringUtils.isNotBlank(knowledgeinfoEntityDB.getContent()) || StringUtils.isNotBlank(knowledgeinfoEntityDB.getDirectpath()) ) {
UpdateWrapper<KnowledgeinfoEntity> updateWrapper = new UpdateWrapper();
updateWrapper.eq("knowledgeinfoid", knowledgeinfoEntity.getKnowledgeinfoid());
knowledgeinfoService.update(knowledgeinfoEntityDB, updateWrapper);
}
}
n = n + 1;
}
} else {
flag = false;
}
}
}
return R.ok().put("data", null);
}
public static void main(String[] args) {
String str = "\n" +
"<STYLE type=text/css>\n" +
......
src/main/java/io/office/modules/manage/utils/DESUtils.java
......@@ -72,18 +72,25 @@ public class DESUtils {
}
public static void main(String[] args) {
String userName="test_tru";
String password="123123";
//http://wsdt.ancc.org.cn/anccoh/loginOper.jsp?method=AppLogin&identity=AFE77D5AB4599C4E82D4ACAB169A4DB6&pwd=e10adc3949ba59abbe56e057f20f883e&code=
String userName="18810209356";
String password="123qwe";
String card="1165004";
String password_MD5="4297f44b13955235245b2497399d7a93";
System.out.println(MD5Util.unicodeToString("123qwe"));;
String userName_M = DESUtils.byteToHexString(DESUtils.DES_CBC_Encrypt(userName.getBytes(),"appsGdsn".getBytes()));
String password_M = DESUtils.byteToHexString(DESUtils.DES_CBC_Encrypt(password.getBytes(),"appsGdsn".getBytes()));
String password_M_MD5 = DESUtils.byteToHexString(DESUtils.DES_CBC_Encrypt(password_MD5.getBytes(),"appsGdsn".getBytes()));
String card_M_MD5 = DESUtils.byteToHexString(DESUtils.DES_CBC_Encrypt(card.getBytes(),"appsGdsn".getBytes()));
System.out.println(userName_M);
System.out.println(password_M);
System.out.println(password_M_MD5);
System.out.println(card_M_MD5);
String aaa="88DA15B9F9F602F0D32D46808652B06DC6E939D1424CE39F69A2AC39743F7ED7591975685B543E1D";
String aaa="AFE77D5AB4599C4E82D4ACAB169A4DB6";
//String s = new String(DESUtils.DES_CBC_Decrypt(aaa, "appsGdsn".getBytes()));
String s = new String(DESUtils.DES_CBC_Decrypt(aaa, "appsGdsn".getBytes()));
......
src/main/java/io/office/modules/manage/utils/HttpUtlis.java
......@@ -27,4 +27,9 @@ public class HttpUtlis {
throw new RuntimeException(e.getMessage());
}
}
}
src/main/java/io/office/modules/manage/webservice/Test.java
package io.office.modules.manage.webservice;
import cn.hutool.json.JSONUtil;
import io.office.modules.manage.webservice.newWebservice.JaxbUtil;
import io.office.modules.manage.webservice.newWebservice.ProductInformationLink;
import org.jdom.Document;
import org.jdom.Element;
import org.springframework.http.HttpEntity;
......@@ -28,38 +30,22 @@ public class Test {
public static void main(String[] args) throws JAXBException, IOException {
String smsTemplateXml = WebServiceXmlTemplate.SEND_MESSAGE_TEMPLATE.replaceAll("\\$\\{cascade\\}", "9").replaceAll("\\$\\{requestedKeyCode\\}", "GLN")
.replaceAll("\\$\\{requestedKeyValue\\}", "6973947140013").replaceAll("\\$\\{requestedLanguage\\}", "en");
String url = "http://webservice.anccnet.com:8080/gepir4/gepirv4.asmx";
String url = "http://api.chinatrace.org/AAQI/v1/ProductData/gtin/6920582200169?targetMarket=156&dataVersion=1.1&clientGln=6901234503814&mac=F562D581607A5582187B4231B2CEFC7BB94EC11FF5F0D0082AD013F2254103E1";
RestTemplate restTemplate = new RestTemplate();
//创建请求头
//创建请求头
HttpHeaders headers = new HttpHeaders();
headers.set("Content-Type","text/xml; charset=utf-8");
HttpEntity<String> entity = new HttpEntity<>(smsTemplateXml, headers);
ResponseEntity<String> responseEntity = restTemplate.postForEntity(url, entity, String.class);
ResponseEntity<String> responseEntity = restTemplate.getForEntity(url, String.class);
if (responseEntity.getStatusCode().value() == 200) {
// 下面的是通过解析xml字符串的
Document doc = null;
String returnObjs = responseEntity.getBody().substring(responseEntity.getBody().indexOf("<partyDataLine>"),responseEntity.getBody().indexOf("</gepirParty>"));//注意 获取根节点的时候要查看返回的xml参数的形式是否为一个根节点
String returnObjs = responseEntity.getBody().substring(responseEntity.getBody().indexOf("<productInformationLink>"),responseEntity.getBody().lastIndexOf("</productInformationLink>")+"</productInformationLink>".length());//注意 获取根节点的时候要查看返回的xml参数的形式是否为一个根节点
System.out.println(returnObjs);
Object xmlObject = null;
Reader reader = null;
//利用JAXBContext将类转为一个实例
JAXBContext context = JAXBContext.newInstance(PartyDataLine.class);
//XMl 转为对象的接口
Unmarshaller unmarshaller = context.createUnmarshaller();
reader = new StringReader(returnObjs);
xmlObject = unmarshaller.unmarshal(reader);
if (reader != null) {
reader.close();
}
System.out.println(JSONUtil.toJsonStr(xmlObject));
ProductInformationLink book = JaxbUtil.converyToJavaBean(returnObjs, ProductInformationLink.class);
book.getUrl();
System.out.println(JSONUtil.toJsonStr(book));
System.out.println(book.getUrl());
/*Object xmlObject = null;
Reader reader = null;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment