diff --git a/.DS_Store b/.DS_Store index 6fd82d3..8bd74ae 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/iot-modules/.DS_Store b/iot-modules/.DS_Store index e368698..a0136a5 100644 Binary files a/iot-modules/.DS_Store and b/iot-modules/.DS_Store differ diff --git a/iot-modules/iot-customer-http-api/.DS_Store b/iot-modules/iot-customer-http-api/.DS_Store new file mode 100644 index 0000000..4de8e03 Binary files /dev/null and b/iot-modules/iot-customer-http-api/.DS_Store differ diff --git a/iot-modules/iot-customer-http-api/src/.DS_Store b/iot-modules/iot-customer-http-api/src/.DS_Store new file mode 100644 index 0000000..a2eb533 Binary files /dev/null and b/iot-modules/iot-customer-http-api/src/.DS_Store differ diff --git a/iot-modules/iot-customer-http-api/src/test/java/com/qiuguo/iot/customer/http/api/mysql/MysqlMain.java b/iot-modules/iot-customer-http-api/src/test/java/com/qiuguo/iot/customer/http/api/mysql/MysqlMain.java index fa1364c..75aabe2 100644 --- a/iot-modules/iot-customer-http-api/src/test/java/com/qiuguo/iot/customer/http/api/mysql/MysqlMain.java +++ b/iot-modules/iot-customer-http-api/src/test/java/com/qiuguo/iot/customer/http/api/mysql/MysqlMain.java @@ -69,7 +69,7 @@ public class MysqlMain { list.add(new TablesBean("aigc_template_type")); list.add(new TablesBean("aigc_tts")); list.add(new TablesBean("aigc_tts_type")); - //list.add(new TablesBean("system_same_talk")); + list.add(new TablesBean("system_same_talk")); List list2 = new ArrayList(); Map map = MysqlUtil2ShowCreateTable.getComments(); @@ -97,7 +97,7 @@ public class MysqlMain { MysqlUtilTable2Bean.printDto(list2.get(i), AUTH, isSwaggerEnabled); } //打印BaseIdReq - TablesBean baseIdBean = new TablesBean("base_id"); + /*TablesBean baseIdBean = new TablesBean("base_id"); List itemList = new ArrayList<>(); FieldBean fieldBean = new FieldBean("id", "Long", "数据的id"); fieldBean.setJavaCode("id"); @@ -132,7 +132,7 @@ public class MysqlMain { for (int i = 0; i < list2.size(); i++) { MysqlUtilTable2Service.printService(list2.get(i), AUTH); MysqlUtilTable2Service.printServiceImpl(list2.get(i), AUTH); - } + }*/ for (int i = 0; i < list2.size(); i++) { MysqlUtilTable2XML.printXMLForMap(list2.get(i)); diff --git a/iot-modules/iot-customer-http-api/src/test/java/com/qiuguo/iot/customer/http/api/mysql/mybatis/MysqlUtilTable2XML.java b/iot-modules/iot-customer-http-api/src/test/java/com/qiuguo/iot/customer/http/api/mysql/mybatis/MysqlUtilTable2XML.java index a7c8200..befb8a0 100644 --- a/iot-modules/iot-customer-http-api/src/test/java/com/qiuguo/iot/customer/http/api/mysql/mybatis/MysqlUtilTable2XML.java +++ b/iot-modules/iot-customer-http-api/src/test/java/com/qiuguo/iot/customer/http/api/mysql/mybatis/MysqlUtilTable2XML.java @@ -25,10 +25,10 @@ public class MysqlUtilTable2XML { bf.append("").append("\n"); bf.append("").append("\n"); - bf.append("").append("\n"); + bf.append("").append("\n"); bf.append("\n"); bf.append(" \n"); - bf.append(" \n"); + bf.append(" \n"); List list = bean.getFieldList(); int i = 0; @@ -65,7 +65,7 @@ public class MysqlUtilTable2XML { bf.append("\n"); bf.append("\n"); // 根据ID删除 - bf.append(TAB).append("").append("\n"); bf.append(TAB).append(TAB).append("select * from ").append(bean.getTableName()).append(" where id=#{id} and is_delete = 0 limit 1 ").append("\n"); bf.append(TAB).append("").append("\n"); bf.append("\n"); @@ -73,11 +73,11 @@ public class MysqlUtilTable2XML { ///////////////////////////////////////////////////////////////////////////////////////////////////////// - bf.append(TAB).append("").append("\n"); + bf.append(TAB).append("").append("\n"); bf.append(TAB).append(TAB).append("insert into ").append(bean.getTableName()).append("(").append("\n"); for (i = 0; i < bean.getFieldList().size(); i++) { FieldBean obj = bean.getFieldList().get(i); - if ("id".equals(obj.getField().toLowerCase()) || "create_time".equals(obj.getField()) || "update_time".equals(obj.getField()) + if ("id".equals(obj.getField().toLowerCase()) || "create_time".equals(obj.getField()) || "modify_time".equals(obj.getField()) || "is_delete".equals(obj.getField())) { continue; } @@ -86,12 +86,12 @@ public class MysqlUtilTable2XML { bf.append(TAB).append(TAB).append(TAB).append("is_delete,").append("\n"); bf.append(TAB).append(TAB).append(TAB).append("create_time,").append("\n"); - bf.append(TAB).append(TAB).append(TAB).append("update_time").append("\n"); + bf.append(TAB).append(TAB).append(TAB).append("modify_time").append("\n"); bf.append(TAB).append(TAB).append(")values(").append("\n"); for (i = 0; i < bean.getFieldList().size(); i++) { FieldBean obj = bean.getFieldList().get(i); if ("id".equals(obj.getField().toLowerCase()) || "create_time".equals(obj.getField()) - || "update_time".equals(obj.getField()) || "is_delete".equals(obj.getField())) { + || "modify_time".equals(obj.getField()) || "is_delete".equals(obj.getField())) { continue; } bf.append(TAB).append(TAB).append(TAB).append("#{ ").append(obj.getJavaCode()).append("}, ").append("\n"); @@ -108,14 +108,14 @@ public class MysqlUtilTable2XML { ///////////////////////////////////////////////////////////////////////////////////////////////////////// - bf.append(TAB).append("").append("\n"); + bf.append(TAB).append("").append("\n"); bf.append(TAB).append(TAB).append("update").append("\n"); bf.append(TAB).append(TAB).append(TAB).append(bean.getTableName()).append("\n"); bf.append(TAB).append(TAB).append("").append("\n"); - bf.append(TAB).append(TAB).append("update_time = now()").append("\n"); + bf.append(TAB).append(TAB).append("modify_time = now()").append("\n"); for (i = 0; i < bean.getFieldList().size(); i++) { FieldBean obj = bean.getFieldList().get(i); - if ("id".equals(obj.getField().toLowerCase()) || "update_time".equals(obj.getField())) { + if ("id".equals(obj.getField().toLowerCase()) || "modify_time".equals(obj.getField())) { continue; } bf.append(TAB).append(TAB).append(TAB).append(", "); @@ -148,14 +148,14 @@ public class MysqlUtilTable2XML { bf.append("\n"); bf.append("\n"); - bf.append(TAB).append("").append("\n"); + bf.append(TAB).append("").append("\n"); bf.append(TAB).append(TAB).append("update").append("\n"); bf.append(TAB).append(TAB).append(TAB).append(bean.getTableName()).append(TAB).append("\n"); bf.append(TAB).append(TAB).append("set ").append(TAB).append("\n"); - bf.append(TAB).append(TAB).append("update_time = now()").append("\n"); + bf.append(TAB).append(TAB).append("modify_time = now()").append("\n"); for (i = 0; i < bean.getFieldList().size(); i++) { FieldBean obj = bean.getFieldList().get(i); - if ("id".equals(obj.getField().toLowerCase()) || "update_time".equals(obj.getField())) { + if ("id".equals(obj.getField().toLowerCase()) || "modify_time".equals(obj.getField())) { continue; } bf.append(TAB).append(TAB).append(TAB).append(", ").append(obj.getField()).append(" = #{").append(obj.getJavaCode()).append("}\n"); @@ -173,11 +173,11 @@ public class MysqlUtilTable2XML { bf.append("\n"); // 根据ID删除 bf.append(TAB).append("").append("\n"); - bf.append(TAB).append(TAB).append("update ").append(bean.getTableName()).append(" set is_delete = 1, update_time = now() where id=#{id} limit 1 ").append("\n"); + bf.append(TAB).append(TAB).append("update ").append(bean.getTableName()).append(" set is_delete = 1, modify_time = now() where id=#{id} limit 1 ").append("\n"); bf.append(TAB).append("").append("\n"); bf.append("\n"); - bf.append(TAB).append("").append("\n"); bf.append(TAB).append(TAB).append("select * from ").append(bean.getTableName()).append(" where is_delete = 0").append("\n"); for (i = 0; i < bean.getFieldList().size(); i++) { FieldBean obj = bean.getFieldList().get(i); @@ -206,7 +206,7 @@ public class MysqlUtilTable2XML { bf.append("\n"); bf.append("\n"); - bf.append(TAB).append("").append("\n"); bf.append(TAB).append(TAB).append("select * from ").append(bean.getTableName()).append(" where is_delete = 0").append("\n"); for (i = 0; i < bean.getFieldList().size(); i++) { FieldBean obj = bean.getFieldList().get(i);